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

0030616: Crash on reading STEP file

Browse Source 
Added protections to avoid exceptions for null objects.
For reading entity StepShape_ToleranceValue was added reading lower and upper bounds represented by entities "StepRepr_ReprItemAndMeasureWithUnit" or "StepRepr_MeasureRepresentationItem"
This commit is contained in:
gka 2019-03-28 18:25:20 +03:00 committed by apn
parent 2a0522b1c6
commit 33defc7121
5 changed files with 94 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/RWStepShape/RWStepShape_RWToleranceValue.cxx
View File

@ -19,6 +19,8 @@
#include <StepData_StepReaderData.hxx> #include <StepData_StepReaderData.hxx>
#include <StepData_StepWriter.hxx> #include <StepData_StepWriter.hxx>
#include <StepShape_ToleranceValue.hxx> #include <StepShape_ToleranceValue.hxx>
#include <StepRepr_MeasureRepresentationItem.hxx>
#include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
RWStepShape_RWToleranceValue::RWStepShape_RWToleranceValue () {} RWStepShape_RWToleranceValue::RWStepShape_RWToleranceValue () {}
@ -34,18 +36,45 @@ void RWStepShape_RWToleranceValue::ReadStep
// --- own field : lower_bound --- // --- own field : lower_bound ---
Handle(StepBasic_MeasureWithUnit) LB; Handle(Standard_Transient) LB;
data->ReadEntity (num,1,"lower_bound",ach, if(!data->ReadEntity (num,1,"lower_bound",ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),LB); STANDARD_TYPE(StepBasic_MeasureWithUnit),LB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU;
if(data->ReadEntity (num,1,"lower_bound",ach,
STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR) ||
data->ReadEntity (num,1,"lower_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU))
{
if(!aMSR.IsNull())
LB = aMSR;
else if(!aRIMU.IsNull())
LB = aRIMU;
}
}
// --- own field : upper_bound --- // --- own field : upper_bound ---
Handle(StepBasic_MeasureWithUnit) UB; Handle(Standard_Transient) UB;
data->ReadEntity (num,2,"upper_bound",ach, if(!data->ReadEntity (num,2,"upper_bound",ach,
STANDARD_TYPE(StepBasic_MeasureWithUnit),UB); STANDARD_TYPE(StepBasic_MeasureWithUnit),UB))
{
Handle(StepRepr_MeasureRepresentationItem) aMSR1;
Handle(StepRepr_ReprItemAndMeasureWithUnit) aRIMU1;
if(data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_MeasureRepresentationItem),aMSR1) ||
data->ReadEntity (num,2,"upper_bound",ach,STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit), aRIMU1))
{
if(!aMSR1.IsNull())
UB = aMSR1;
else if(!aRIMU1.IsNull())
UB = aRIMU1;
}
}
//--- Initialisation of the read entity --- //--- Initialisation of the read entity ---
if( !LB.IsNull() && !UB.IsNull())
ach->ClearFails();
ent->Init(LB,UB); ent->Init(LB,UB);
} }

44
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -3239,9 +3239,23 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
aTV = aTMD.ToleranceValue(); aTV = aTMD.ToleranceValue();
if (aTV.IsNull()) continue; if (aTV.IsNull()) continue;
Handle(StepBasic_MeasureWithUnit) aMWU = aTV->UpperBound(); Handle(Standard_Transient) aUpperBound = aTV->UpperBound();
Standard_Real aVal = aTV->UpperBound()->ValueComponent(); if(aUpperBound.IsNull())
StepBasic_Unit anUnit = aTV->UpperBound()->UnitComponent(); continue;
Handle(StepBasic_MeasureWithUnit) aMWU;
if(aUpperBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aUpperBound);
else if(aUpperBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aUpperBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
if(aMWU.IsNull())
continue;
Standard_Real aVal = aMWU->ValueComponent();
StepBasic_Unit anUnit = aMWU->UnitComponent();
if (anUnit.IsNull()) continue; if (anUnit.IsNull()) continue;
if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue; if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit(); Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
@ -3259,9 +3273,25 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
} }
aDim3 = aVal; aDim3 = aVal;
aMWU = aTV->LowerBound();
aVal = aTV->LowerBound()->ValueComponent(); Handle(Standard_Transient) aLowerBound = aTV->LowerBound();
anUnit = aTV->LowerBound()->UnitComponent(); if(aLowerBound.IsNull())
continue;
if(aLowerBound->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) )
aMWU = Handle(StepBasic_MeasureWithUnit)::DownCast(aLowerBound);
else if(aLowerBound->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndMeasureWithUnit)) )
{
Handle(StepRepr_ReprItemAndMeasureWithUnit) aReprMeasureItem =
Handle(StepRepr_ReprItemAndMeasureWithUnit)::DownCast(aLowerBound);
aMWU = aReprMeasureItem->GetMeasureWithUnit();
}
if(aMWU.IsNull())
continue;
aVal = aMWU->ValueComponent();
anUnit = aMWU->UnitComponent();
if (anUnit.IsNull()) continue; if (anUnit.IsNull()) continue;
if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue; if (!(anUnit.CaseNum(anUnit.Value()) == 1)) continue;
NU = anUnit.NamedUnit(); NU = anUnit.NamedUnit();
@ -4105,7 +4135,7 @@ void collectViewShapes(const Handle(XSControl_WorkSession)& theWS,
if (!anIter.Value()->IsKind(STANDARD_TYPE(StepRepr_RepresentationRelationship))) if (!anIter.Value()->IsKind(STANDARD_TYPE(StepRepr_RepresentationRelationship)))
continue; continue;
Handle(StepRepr_RepresentationRelationship) aReprRelationship = Handle(StepRepr_RepresentationRelationship)::DownCast(anIter.Value()); Handle(StepRepr_RepresentationRelationship) aReprRelationship = Handle(StepRepr_RepresentationRelationship)::DownCast(anIter.Value());
if (aReprRelationship->Rep1() != theRepr) if (!aReprRelationship->Rep1().IsNull() && aReprRelationship->Rep1() != theRepr)
collectViewShapes(theWS, theDoc, aReprRelationship->Rep1(), theShapes); collectViewShapes(theWS, theDoc, aReprRelationship->Rep1(), theShapes);
} }
} }

12
src/StepShape/StepShape_ToleranceValue.cxx
View File

@ -21,21 +21,21 @@ IMPLEMENT_STANDARD_RTTIEXT(StepShape_ToleranceValue,Standard_Transient)
StepShape_ToleranceValue::StepShape_ToleranceValue () { } StepShape_ToleranceValue::StepShape_ToleranceValue () { }
void StepShape_ToleranceValue::Init void StepShape_ToleranceValue::Init
(const Handle(StepBasic_MeasureWithUnit)& lower_bound, (const Handle(Standard_Transient)& lower_bound,
const Handle(StepBasic_MeasureWithUnit)& upper_bound) const Handle(Standard_Transient)& upper_bound)
{ {
theLowerBound = lower_bound; theLowerBound = lower_bound;
theUpperBound = upper_bound; theUpperBound = upper_bound;
} }
Handle(StepBasic_MeasureWithUnit) StepShape_ToleranceValue::LowerBound () const Handle(Standard_Transient) StepShape_ToleranceValue::LowerBound () const
{ return theLowerBound; } { return theLowerBound; }
void StepShape_ToleranceValue::SetLowerBound (const Handle(StepBasic_MeasureWithUnit)& lower_bound) void StepShape_ToleranceValue::SetLowerBound (const Handle(Standard_Transient)& lower_bound)
{ theLowerBound = lower_bound; } { theLowerBound = lower_bound; }
Handle(StepBasic_MeasureWithUnit) StepShape_ToleranceValue::UpperBound () const Handle(Standard_Transient) StepShape_ToleranceValue::UpperBound () const
{ return theUpperBound; } { return theUpperBound; }
void StepShape_ToleranceValue::SetUpperBound (const Handle(StepBasic_MeasureWithUnit)& upper_bound) void StepShape_ToleranceValue::SetUpperBound (const Handle(Standard_Transient)& upper_bound)
{ theUpperBound = upper_bound; } { theUpperBound = upper_bound; }

14
src/StepShape/StepShape_ToleranceValue.hxx
View File

@ -35,15 +35,15 @@ public:
Standard_EXPORT StepShape_ToleranceValue(); Standard_EXPORT StepShape_ToleranceValue();
Standard_EXPORT void Init (const Handle(StepBasic_MeasureWithUnit)& lower_bound, const Handle(StepBasic_MeasureWithUnit)& upper_bound); Standard_EXPORT void Init (const Handle(Standard_Transient)& lower_bound, const Handle(Standard_Transient)& upper_bound);
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) LowerBound() const; Standard_EXPORT Handle(Standard_Transient) LowerBound() const;
Standard_EXPORT void SetLowerBound (const Handle(StepBasic_MeasureWithUnit)& lower_bound); Standard_EXPORT void SetLowerBound (const Handle(Standard_Transient)& lower_bound);
Standard_EXPORT Handle(StepBasic_MeasureWithUnit) UpperBound() const; Standard_EXPORT Handle(Standard_Transient) UpperBound() const;
Standard_EXPORT void SetUpperBound (const Handle(StepBasic_MeasureWithUnit)& upper_bound); Standard_EXPORT void SetUpperBound (const Handle(Standard_Transient)& upper_bound);
@ -58,8 +58,8 @@ protected:
private: private:
Handle(StepBasic_MeasureWithUnit) theLowerBound; Handle(Standard_Transient) theLowerBound;
Handle(StepBasic_MeasureWithUnit) theUpperBound; Handle(Standard_Transient) theUpperBound;
}; };

8
tests/bugs/step/bug30616 Normal file
View File

@ -0,0 +1,8 @@
puts "===================================="
puts "0030616: Crash on reading STEP file"
puts "===================================="
puts ""
param xstep.cascade.unit M
ReadStep D [locate_data_file bug30616_nist_ctc_01_asme1_ap242.stp]