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/XFileImporter.cpp
+++ b/code/XFileImporter.cpp
@@ -165,6 +165,10 @@ void XFileImporter::CreateDataRepresentationFromImport( aiScene* pScene, XFile::
 		CreateMeshes( pScene, pScene->mRootNode, pData->mGlobalMeshes);
 	}

+	if (!pScene->mRootNode) {
+		throw DeadlyImportError( "No root node" );
+	}
+
 	// Convert everything to OpenGL space... it's the same operation as the conversion back, so we can reuse the step directly
 	MakeLeftHandedProcess convertProcess;
 	convertProcess.Execute( pScene);