v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #813 from tgoulart/obj_loader_leak 

Fix memory leak in OBJ loader when a mesh has no faces.
pull/819/head
Kim Kulling 2016-03-04 16:41:57 +01:00
parent f774bde20b 3c9e57fd73
commit 80f4e69938
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/ObjFileImporter.cpp
View File

@ -308,7 +308,11 @@ aiMesh *ObjFileImporter::createTopology( const ObjFile::Model* pModel, const Obj
if( !pObjMesh ) { if( !pObjMesh ) {
return NULL; return NULL;
} }
ai_assert( NULL != pObjMesh );
if( pObjMesh->m_Faces.empty() ) {
return NULL;
}
aiMesh* pMesh = new aiMesh; aiMesh* pMesh = new aiMesh;
if( !pObjMesh->m_name.empty() ) { if( !pObjMesh->m_name.empty() ) {
pMesh->mName.Set( pObjMesh->m_name ); pMesh->mName.Set( pObjMesh->m_name );