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

0031292: Data Exchange - SIGSEGV on reading STEP file with references to invalid entities

Browse Source 
Changes:

- in StepData_StepReaderData::ReadEntity, make sure that entity handle is not null before calling IsKind() of it.

- in StepData_StepReaderData::SetEntityNumbers, do not invert the sign of entity number of referenced parameter if the second pass is not required. Otherwise, the number -1 (obviously invalid) becomes 1 (invalid, but not obviously) without further correction of it.

- in StepData_UndefinedEntity::ReadRecord, consider the case when the entity number is positive but refers to non-existing entity. In this case literal value will be used instead of null entity for the problematic parameter.
This commit is contained in:
msv
2020-01-10 20:59:51 +03:00
parent 56609574c6
commit 068969acef
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/StepData/StepData_StepReaderData.cxx
View File

@@ -1038,7 +1038,7 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer num,
if (entent.IsNull() || !entent->IsKind(atype)) if (entent.IsNull() || !entent->IsKind(atype))
{ {
errmess = new String("Parameter n0.%d (%s) : Entity has illegal type"); errmess = new String("Parameter n0.%d (%s) : Entity has illegal type");
if (entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity))) if (!entent.IsNull() && entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity)))
ent = entent; ent = entent;
} }
else ent = entent; else ent = entent;
@@ -1087,7 +1087,7 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer num,
{ {
errmess = new String("Parameter n0.%d (%s) : Entity has illegal type"); errmess = new String("Parameter n0.%d (%s) : Entity has illegal type");
//fot not suppported STEP entity //fot not suppported STEP entity
if (entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity))) if (!entent.IsNull() && entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity)))
sel.SetValue(entent); sel.SetValue(entent);
} }
else else
@@ -1583,8 +1583,10 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap)
if (num0 > 0) FP.SetEntityNumber(num0); // ET VOILA, on a resolu if (num0 > 0) FP.SetEntityNumber(num0); // ET VOILA, on a resolu
else FP.SetEntityNumber(-id); // CONFLIT -> faudra resoudre ... else FP.SetEntityNumber(-id); // CONFLIT -> faudra resoudre ...
} else { // NON RESOLU, si pas pbmap, le dire } else { // NON RESOLU, si pas pbmap, le dire
FP.SetEntityNumber(-id); if (pbmap) {
if (pbmap) continue; // pbmap : on se retrouvera FP.SetEntityNumber(-id);
continue; // pbmap : on se retrouvera
}
char failmess[100]; char failmess[100];
// ... Construire le Check ... // ... Construire le Check ...
sprintf(failmess, sprintf(failmess,

9
src/StepData/StepData_UndefinedEntity.cxx
View File

@@ -67,13 +67,16 @@ void StepData_UndefinedEntity::ReadRecord(const Handle(StepData_StepReaderData)&
Standard_Integer nume = 0; Standard_Integer nume = 0;
if (partyp == Interface_ParamIdent) { if (partyp == Interface_ParamIdent) {
nume = SR->ParamNumber(num,i); nume = SR->ParamNumber(num,i);
if (nume > 0) {
anent = SR->BoundEntity(nume);
if (anent.IsNull()) {
nume = 0;
}
}
if (nume <= 0) { if (nume <= 0) {
ach->AddFail("A reference to another entity is unresolved"); ach->AddFail("A reference to another entity is unresolved");
partyp = Interface_ParamVoid; partyp = Interface_ParamVoid;
} }
else {
anent = SR->BoundEntity(nume);
}
} }
else if (partyp == Interface_ParamSub) { else if (partyp == Interface_ParamSub) {
nume = SR->ParamNumber(num,i); nume = SR->ParamNumber(num,i);