OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023736: Exeption during reading STEP file in Test Harness

Browse Source 
Add checking for null name and null id
Adding of test cases for CR23736
This commit is contained in:
ika 2013-02-08 14:50:50 +04:00
parent 92f122144f
commit ab4a555430
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -1069,8 +1069,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadNames (const Handle(XSControl_WorkSe
if ( PDR.IsNull() ) continue; if ( PDR.IsNull() ) continue;
if ( PDR->HasDescription() && if ( PDR->HasDescription() &&
PDR->Description()->Length() >0 ) name = PDR->Description(); PDR->Description()->Length() >0 ) name = PDR->Description();
else if ( PDR->Name()->Length() >0 ) name = PDR->Name(); else if ( !PDR->Name().IsNull() && PDR->Name()->Length() >0 ) name = PDR->Name();
else name = PDR->Id(); else if ( !PDR->Id().IsNull()) name = PDR->Id();
else name = new TCollection_HAsciiString;
} }
// find proper label // find proper label
L = FindInstance ( NAUO, STool, Tool, PDFileMap, ShapeLabelMap ); L = FindInstance ( NAUO, STool, Tool, PDFileMap, ShapeLabelMap );
@ -1086,8 +1087,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadNames (const Handle(XSControl_WorkSe
Handle(StepBasic_ProductDefinition)::DownCast(enti); Handle(StepBasic_ProductDefinition)::DownCast(enti);
if(PD.IsNull()) continue; if(PD.IsNull()) continue;
Handle(StepBasic_Product) Prod = PD->Formation()->OfProduct(); Handle(StepBasic_Product) Prod = PD->Formation()->OfProduct();
if(Prod->Name()->UsefullLength()>0) name = Prod->Name(); if(!Prod->Name().IsNull() && Prod->Name()->UsefullLength()>0) name = Prod->Name();
else name = Prod->Id(); else if (!Prod->Id().IsNull()) name = Prod->Id();
else name = new TCollection_HAsciiString;
L = GetLabelFromPD ( PD, STool, TP, PDFileMap, ShapeLabelMap ); L = GetLabelFromPD ( PD, STool, TP, PDFileMap, ShapeLabelMap );
if ( L.IsNull() ) continue; if ( L.IsNull() ) continue;
TCollection_ExtendedString str ( name->String() ); TCollection_ExtendedString str ( name->String() );

15
tests/bugs/xde/bug23736 Normal file
View File

@ -0,0 +1,15 @@
puts "============"
puts "CR23736"
puts "============"
puts ""
######################################################
# Exeption during reading STEP file in Test Harness
######################################################
pload DCAF
NewDocument D MDTV-XCAF
UndoLimit D 100
NewCommand D
ReadStep D [locate_data_file mat.stp]