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

# MD5 loader: fail early for empty files 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@959 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2011-04-22 15:54:42 +00:00
parent 1fcb1a1d8e
commit 5576b31aa6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/MD5Loader.cpp
View File

@ -173,6 +173,7 @@ void MD5Importer::LoadFileIntoMemory (IOStream* file)
ai_assert(NULL != file); ai_assert(NULL != file);
fileSize = (unsigned int)file->FileSize(); fileSize = (unsigned int)file->FileSize();
ai_assert(fileSize);
// allocate storage and copy the contents of the file to a memory buffer // allocate storage and copy the contents of the file to a memory buffer
pScene = pScene; pScene = pScene;
@ -334,8 +335,8 @@ void MD5Importer::LoadMD5MeshFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb")); boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// Check whether we can read from the file // Check whether we can read from the file
if( file.get() == NULL) { if( file.get() == NULL || !file->FileSize()) {
DefaultLogger::get()->warn("Failed to read MD5MESH file: " + pFile); DefaultLogger::get()->warn("Failed to access MD5MESH file: " + pFile);
return; return;
} }
bHadMD5Mesh = true; bHadMD5Mesh = true;
@ -550,7 +551,7 @@ void MD5Importer::LoadMD5AnimFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb")); boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// Check whether we can read from the file // Check whether we can read from the file
if( file.get() == NULL) { if( !file.get() || !file->FileSize()) {
DefaultLogger::get()->warn("Failed to read MD5ANIM file: " + pFile); DefaultLogger::get()->warn("Failed to read MD5ANIM file: " + pFile);
return; return;
} }
@ -665,7 +666,7 @@ void MD5Importer::LoadMD5CameraFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb")); boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// Check whether we can read from the file // Check whether we can read from the file
if( file.get() == NULL) { if( !file.get() || !file->FileSize()) {
throw DeadlyImportError("Failed to read MD5CAMERA file: " + pFile); throw DeadlyImportError("Failed to read MD5CAMERA file: " + pFile);
} }
bHadMD5Camera = true; bHadMD5Camera = true;