Merge pull request #523 from turol/afl-fixes

More crash fixes
2015-06-22 16:56:51 +02:00
parent 71cc64238a 681c32d5ec
commit 85e2f47dc8
6 changed files with 24 additions and 7 deletions
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -431,7 +431,9 @@ void ObjFileImporter::createVertexArray(const ObjFile::Model* pModel,
                pMesh->mTextureCoords[ 0 ][ newIndex ] = aiVector3D( coord3d.x, coord3d.y, coord3d.z );
            }

-            ai_assert( pMesh->mNumVertices > newIndex );
+            if ( pMesh->mNumVertices <= newIndex ) {
+                throw DeadlyImportError("OBJ: bad vertex index");
+            }

            // Get destination face
            aiFace *pDestFace = &pMesh->mFaces[ outIndex ];