OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0028147: Data Exchange - NULL dereference while reading color from STEP file

Browse Source 
StepVisual_StyledItem::Item() now does not call IsKind() on NULL object.
Add several checks for NULL to import/export.

Add test case bugs/step/bug28147
This commit is contained in:
kgv
2016-11-23 15:53:48 +03:00
committed by apn
parent bb2cf06962
commit aff1875311
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/STEPCAFControl/STEPCAFControl_Writer.cxx
View File

@@ -2050,12 +2050,14 @@ static Standard_Boolean FindPDSforDGT(const Interface_Graph &aGraph,
Handle(StepShape_AdvancedFace) &AF,
Handle(StepShape_EdgeCurve) &EC)
{
if (ent.IsNull())
return Standard_False;
if( !ent->IsKind(STANDARD_TYPE(StepShape_EdgeCurve)) &&
!ent->IsKind(STANDARD_TYPE(StepShape_AdvancedFace)) )
return Standard_False;
AF = Handle(StepShape_AdvancedFace)::DownCast(ent);
if( ent->IsKind(STANDARD_TYPE(StepShape_EdgeCurve)) ) {
if( AF.IsNull() ) {
EC = Handle(StepShape_EdgeCurve)::DownCast(ent);
Interface_EntityIterator subs = aGraph.Sharings(EC);
for(subs.Start(); subs.More() && AF.IsNull(); subs.Next()) {
@@ -3969,7 +3971,8 @@ static Standard_Boolean FindPDSforRI(const Interface_Graph &aGraph,
Handle(StepRepr_ProductDefinitionShape) &PDS,
Handle(StepRepr_RepresentationContext) &RC)
{
if(!ent->IsKind(STANDARD_TYPE(StepRepr_RepresentationItem))) return Standard_False;
if(ent.IsNull() || !ent->IsKind(STANDARD_TYPE(StepRepr_RepresentationItem)))
return Standard_False;
Interface_EntityIterator subs = aGraph.Sharings(ent);
for(subs.Start(); subs.More() && PDS.IsNull(); subs.Next()) {
Handle(StepShape_ShapeRepresentation) SR =