From 0df4bbd689e4640edc03a46235f2bc398c0c5b12 Mon Sep 17 00:00:00 2001
From: nbv <nbv@opencascade.com>
Date: Tue, 20 Nov 2018 16:34:27 +0300
Subject: [PATCH] 0030380: Exception while reading Step-file

Incorrect initialization of array (when upper bound is less than lower bound) has been avoided in some places.
---
 .../RWStepFEA_RWCurve3dElementRepresentation.cxx    |  4 ++--
 src/RWStepFEA/RWStepFEA_RWDummyNode.cxx             |  4 ++--
 src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx |  4 ++--
 src/RWStepFEA/RWStepFEA_RWFeaModel.cxx              |  4 ++--
 src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx            |  4 ++--
 src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx         |  4 ++--
 src/RWStepFEA/RWStepFEA_RWNode.cxx                  |  4 ++--
 src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx    |  4 ++--
 ...RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx |  4 ++--
 src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx        |  4 ++--
 .../RWStepFEA_RWSurface3dElementRepresentation.cxx  |  4 ++--
 .../RWStepFEA_RWVolume3dElementRepresentation.cxx   |  4 ++--
 .../RWStepShape_RWCompoundShapeRepresentation.cxx   |  4 ++--
 ...StepShape_RWConnectedFaceShapeRepresentation.cxx |  4 ++--
 ...hape_RWEdgeBasedWireframeShapeRepresentation.cxx |  4 ++--
 ...hape_RWNonManifoldSurfaceShapeRepresentation.cxx |  4 ++--
 .../RWStepShape_RWPointRepresentation.cxx           |  4 ++--
 .../RWStepShape_RWShapeDimensionRepresentation.cxx  |  4 ++--
 ...tepShape_RWShapeRepresentationWithParameters.cxx |  4 ++--
 src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx |  4 ++--
 src/STEPConstruct/STEPConstruct_Styles.cxx          |  2 +-
 src/StepData/StepData_StepReaderData.cxx            |  5 ++++-
 .../StepVisual_PresentationLayerAssignment.cxx      |  2 +-
 tests/bugs/step/bug30380                            | 13 +++++++++++++
 24 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100644 tests/bugs/step/bug30380

diff --git a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
index 14a96079f2..59d124eea0 100644
--- a/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWCurve3dElementRepresentation.cxx
@@ -127,7 +127,7 @@ void RWStepFEA_RWCurve3dElementRepresentation::WriteStep (StepData_StepWriter& S
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -166,7 +166,7 @@ void RWStepFEA_RWCurve3dElementRepresentation::Share (const Handle(StepFEA_Curve
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx b/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
index c4b86c4a09..4a3cedfb8f 100644
--- a/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWDummyNode.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWDummyNode::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWDummyNode::Share (const Handle(StepFEA_DummyNode) &ent,
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
index 50736dcfdd..b26d60daeb 100644
--- a/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWElementRepresentation.cxx
@@ -105,7 +105,7 @@ void RWStepFEA_RWElementRepresentation::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -134,7 +134,7 @@ void RWStepFEA_RWElementRepresentation::Share (const Handle(StepFEA_ElementRepre
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx b/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
index 366311e490..aa6be8fe5c 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel.cxx
@@ -117,7 +117,7 @@ void RWStepFEA_RWFeaModel::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -153,7 +153,7 @@ void RWStepFEA_RWFeaModel::Share (const Handle(StepFEA_FeaModel) &ent,
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
index 87afc5eb18..a8320ea881 100644
--- a/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWFeaModel3d.cxx
@@ -117,7 +117,7 @@ void RWStepFEA_RWFeaModel3d::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -153,7 +153,7 @@ void RWStepFEA_RWFeaModel3d::Share (const Handle(StepFEA_FeaModel3d) &ent,
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx b/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
index 8a3a59b128..9c9af39cec 100644
--- a/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWGeometricNode.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWGeometricNode::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWGeometricNode::Share (const Handle(StepFEA_GeometricNode) &ent,
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWNode.cxx b/src/RWStepFEA/RWStepFEA_RWNode.cxx
index 9cd0602bb0..0082e89cfb 100644
--- a/src/RWStepFEA/RWStepFEA_RWNode.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNode.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWNode::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWNode::Share (const Handle(StepFEA_Node) &ent,
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
index a3d7694ed6..36ed76443b 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeRepresentation.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWNodeRepresentation::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWNodeRepresentation::Share (const Handle(StepFEA_NodeRepresentat
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
index 12d80686e1..ae2e6b0123 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithSolutionCoordinateSystem.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWNodeWithSolutionCoordinateSystem::WriteStep (StepData_StepWrite
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWNodeWithSolutionCoordinateSystem::Share (const Handle(StepFEA_N
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
index 9469c856c5..54aee7e877 100644
--- a/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWNodeWithVector.cxx
@@ -94,7 +94,7 @@ void RWStepFEA_RWNodeWithVector::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -118,7 +118,7 @@ void RWStepFEA_RWNodeWithVector::Share (const Handle(StepFEA_NodeWithVector) &en
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
index c525aed3e1..d7606faa8b 100644
--- a/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWSurface3dElementRepresentation.cxx
@@ -127,7 +127,7 @@ void RWStepFEA_RWSurface3dElementRepresentation::WriteStep (StepData_StepWriter&
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -166,7 +166,7 @@ void RWStepFEA_RWSurface3dElementRepresentation::Share (const Handle(StepFEA_Sur
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
index 84154454f9..53375399ab 100644
--- a/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
+++ b/src/RWStepFEA/RWStepFEA_RWVolume3dElementRepresentation.cxx
@@ -122,7 +122,7 @@ void RWStepFEA_RWVolume3dElementRepresentation::WriteStep (StepData_StepWriter&
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -159,7 +159,7 @@ void RWStepFEA_RWVolume3dElementRepresentation::Share (const Handle(StepFEA_Volu
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
index 3dbc356bed..80d52c60ea 100644
--- a/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWCompoundShapeRepresentation.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWCompoundShapeRepresentation::WriteStep (StepData_StepWriter&
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWCompoundShapeRepresentation::Share (const Handle(StepShape_Co
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
index 9ad0c3c232..fabfd8f850 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceShapeRepresentation.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWConnectedFaceShapeRepresentation::WriteStep (StepData_StepWri
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWConnectedFaceShapeRepresentation::Share (const Handle(StepSha
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
index 72dbad259b..08c0e611d3 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWEdgeBasedWireframeShapeRepresentation.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWEdgeBasedWireframeShapeRepresentation::WriteStep (StepData_St
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWEdgeBasedWireframeShapeRepresentation::Share (const Handle(St
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
index 27b4ff6b26..6c6d9bae71 100644
--- a/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWNonManifoldSurfaceShapeRepresentation.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWNonManifoldSurfaceShapeRepresentation::WriteStep (StepData_St
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWNonManifoldSurfaceShapeRepresentation::Share (const Handle(St
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx b/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
index 5243d03b8b..a911af0cac 100644
--- a/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWPointRepresentation.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWPointRepresentation::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWPointRepresentation::Share (const Handle(StepShape_PointRepre
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
index 384cf03c84..76556992ed 100644
--- a/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeDimensionRepresentation.cxx
@@ -107,7 +107,7 @@ void RWStepShape_RWShapeDimensionRepresentation::WriteStep (StepData_StepWriter&
 
   SW.OpenSub();
   if (ent->ItemsAP242().IsNull()) {
-    for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+    for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
       Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
       SW.Send (Var0);
     }
@@ -135,7 +135,7 @@ void RWStepShape_RWShapeDimensionRepresentation::Share (const Handle(StepShape_S
   // Inherited fields of Representation
 
   if (ent->ItemsAP242().IsNull()) {
-    for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+    for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
       Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
       iter.AddItem (Var0);
     }
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
index 9e07e93e80..91559411b8 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentationWithParameters.cxx
@@ -87,7 +87,7 @@ void RWStepShape_RWShapeRepresentationWithParameters::WriteStep (StepData_StepWr
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepShape_RWShapeRepresentationWithParameters::Share (const Handle(StepSh
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
index 5a941ec0f9..13161312c1 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
@@ -87,7 +87,7 @@ void RWStepVisual_RWDraughtingModel::WriteStep (StepData_StepWriter& SW,
   SW.Send (ent->StepRepr_Representation::Name());
 
   SW.OpenSub();
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     SW.Send (Var0);
   }
@@ -107,7 +107,7 @@ void RWStepVisual_RWDraughtingModel::Share (const Handle(StepVisual_DraughtingMo
 
   // Inherited fields of Representation
 
-  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::Items()->Length(); i1++ ) {
+  for (Standard_Integer i1=1; i1 <= ent->StepRepr_Representation::NbItems(); i1++ ) {
     Handle(StepRepr_RepresentationItem) Var0 = ent->StepRepr_Representation::Items()->Value(i1);
     iter.AddItem (Var0);
   }
diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx
index dece07fae5..a4cb702c81 100644
--- a/src/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.cxx
@@ -558,7 +558,7 @@ Standard_Boolean STEPConstruct_Styles::GetColors (const Handle(StepVisual_Styled
   // parse on styles
   for(Standard_Integer j=1; j<=style->NbStyles(); j++ ) {
     Handle(StepVisual_PresentationStyleAssignment) PSA = style->StylesValue ( j );
-    if(PSA.IsNull()) continue;
+    if(PSA.IsNull() || PSA->Styles().IsNull()) continue;
     IsComponent = Standard_True;
     
     for(Standard_Integer k=1; k<=PSA->NbStyles(); k++ ) {
diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index 9a5aa5d0cb..db531285b0 100644
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -456,7 +456,10 @@ Standard_Boolean StepData_StepReaderData::ReadSubList(const Standard_Integer num
   const Standard_Integer /* lenmax */) const
 {
   numsub = SubListNumber(num, nump, Standard_False);
-  if (numsub > 0) return Standard_True;
+  if (numsub > 0)
+  {
+    return (NbParams(numsub) > 0);
+  }
   //  Si optionel indefini, on passe l eponge
   numsub = 0;
   Standard_Boolean isvoid = (Param(num, nump).ParamType() == Interface_ParamVoid);
diff --git a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
index c48d676191..4b7a7378bc 100644
--- a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
+++ b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
@@ -70,5 +70,5 @@ StepVisual_LayeredItem StepVisual_PresentationLayerAssignment::AssignedItemsValu
 
 Standard_Integer StepVisual_PresentationLayerAssignment::NbAssignedItems () const
 {
-	return assignedItems->Length();
+	return assignedItems.IsNull()? 0 : assignedItems->Length();
 }
diff --git a/tests/bugs/step/bug30380 b/tests/bugs/step/bug30380
new file mode 100644
index 0000000000..923f13653e
--- /dev/null
+++ b/tests/bugs/step/bug30380
@@ -0,0 +1,13 @@
+puts "=========="
+puts "0030380: Ex-ception while reading Step-file"
+puts "=========="
+puts ""
+
+ReadStep D_First [locate_data_file bug29633_nist_ctc_05_asme1_ap242-1.stp]
+XGetOneShape result D_First 
+
+checkshape result
+
+checknbshapes result -solid 1 -shell 1 -face 156 -wire 201
+
+checkview -display result -2d -path ${imagedir}/${test_image}.png