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

0023846: A crash on reading of a VRML file with wrong indices

Browse Source 
A check of indices.
Test cases for issue CR23846
This commit is contained in:
vro 2013-10-24 12:00:10 +04:00 committed by bugmaster
parent 78fdb3d3fe
commit 14b04bd216
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/VrmlData/VrmlData_IndexedFaceSet.cxx
View File

@ -93,11 +93,18 @@ const Handle(TopoDS_TShape)& VrmlData_IndexedFaceSet::TShape ()
NCollection_DataMap <int, int> mapNodeId;
// Count non-degenerated triangles
const int nNodes = myCoords->Length();
for (i = 0; i < (int)myNbPolygons; i++) {
const Standard_Integer * arrIndice;
if (Polygon(i, arrIndice) == 3) {
if (arrIndice[0] < 0)
//Check indices for out of bound
if (arrIndice[0] < 0 ||
arrIndice[0] >= nNodes ||
arrIndice[1] >= nNodes ||
arrIndice[2] >= nNodes)
{
continue;
}
const gp_XYZ aVec[2] = {
arrNodes[arrIndice[1]] - arrNodes[arrIndice[0]],
arrNodes[arrIndice[2]] - arrNodes[arrIndice[0]]
@ -148,7 +155,10 @@ const Handle(TopoDS_TShape)& VrmlData_IndexedFaceSet::TShape ()
for (i = 0; i < (int)myNbPolygons; i++) {
const Standard_Integer * arrIndice;
if (Polygon (i, arrIndice) == 3)
if (arrIndice[0] >= 0) // check to avoid previously skipped faces
if (arrIndice[0] >= 0 &&
arrIndice[0] < nNodes &&
arrIndice[1] < nNodes &&
arrIndice[2] < nNodes) // check to avoid previously skipped faces
aTriangles(++nTri).Set (mapNodeId(arrIndice[0]),
mapNodeId(arrIndice[1]),
mapNodeId(arrIndice[2]));
@ -179,7 +189,11 @@ const Handle(TopoDS_TShape)& VrmlData_IndexedFaceSet::TShape ()
for (i = 0; i < (int)myNbPolygons; i++)
{
const Standard_Integer * arrNodes;
if (Polygon(i, arrNodes) == 3 && arrNodes[0] >= 0) // check to avoid previously skipped faces
if (Polygon(i, arrNodes) == 3 &&
arrNodes[0] >= 0 &&
arrNodes[0] < nNodes &&
arrNodes[1] < nNodes &&
arrNodes[2] < nNodes) // check to avoid previously skipped faces
{
const Standard_Integer * arrIndice;
if (IndiceNormals(i, arrIndice) == 3) {

11
tests/bugs/xde/bug23846 Executable file
View File

@ -0,0 +1,11 @@
puts "================"
puts "OCC23846"
puts "================"
puts ""
######################################################################################
# A crash on reading of a VRML file with wrong indices
######################################################################################
loadvrml result [locate_data_file T00000112_0000.wrl]
set 3dviewer 1