Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# MD5 loader: fail early for empty files

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@959 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2011-04-22 15:54:42 +00:00
parent 1fcb1a1d8e
commit 5576b31aa6
1 changed files with 5 additions and 4 deletions
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);
fileSize = (unsigned int)file->FileSize();
ai_assert(fileSize);
// allocate storage and copy the contents of the file to a memory buffer
pScene = pScene;
@@ -334,8 +335,8 @@ void MD5Importer::LoadMD5MeshFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// Check whether we can read from the file
if( file.get() == NULL) {
DefaultLogger::get()->warn("Failed to read MD5MESH file: " + pFile);
if( file.get() == NULL || !file->FileSize()) {
DefaultLogger::get()->warn("Failed to access MD5MESH file: " + pFile);
return;
}
bHadMD5Mesh = true;
@@ -550,7 +551,7 @@ void MD5Importer::LoadMD5AnimFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// 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);
return;
}
@@ -665,7 +666,7 @@ void MD5Importer::LoadMD5CameraFile ()
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
// 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);
}
bHadMD5Camera = true;