0026451: Crash importing STeP file

Add check for NULL.

diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx
index 4dfe51c8187c33104e4b24d811411cbafcb36286..ad131f96c001c5f8015232bc547278f43f17d335 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.cxx
@@ -575,6 +575,8 @@ Standard_Boolean STEPConstruct_Styles::GetColors (const Handle(StepVisual_Styled
          Handle(StepVisual_SurfaceStyleFillArea) SSFA = SSES.SurfaceStyleFillArea();
          if ( !SSFA.IsNull() ) {
            Handle(StepVisual_FillAreaStyle) FAS = SSFA->FillArea();
+      if (FAS.IsNull())
+        continue;
            for ( Standard_Integer m=1; m <= FAS->NbFillStyles(); m++ ) {
              StepVisual_FillStyleSelect FSS = FAS->FillStylesValue ( m );
              Handle(StepVisual_FillAreaStyleColour) FASC = FSS.FillAreaStyleColour();

diff --git a/src/StepVisual/StepVisual_FillAreaStyle.cxx b/src/StepVisual/StepVisual_FillAreaStyle.cxx
index fea1068635804b9f0b2a3e33cc9c707dd3546678..43d5391301222df0d3686098d76af49cdcc61936 100644 (file)
--- a/src/StepVisual/StepVisual_FillAreaStyle.cxx
+++ b/src/StepVisual/StepVisual_FillAreaStyle.cxx
@@ -56,5 +56,5 @@ StepVisual_FillStyleSelect StepVisual_FillAreaStyle::FillStylesValue(const Stand
 
 Standard_Integer StepVisual_FillAreaStyle::NbFillStyles () const
 {
-       return fillStyles->Length();
+  return (fillStyles.IsNull() ? 0 : fillStyles->Length());
 }