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

Merge pull request #2927 from malortie/mdl-fix-buffer-memory-leak 

Fixed memory leak in MDL importer.
pull/2910/head^2
Kim Kulling 2020-01-19 12:19:53 +01:00 committed by GitHub
parent e0571329e7 b74562f8a0
commit 8177706716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 89 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/MDL/MDLLoader.cpp
View File

@ -185,8 +185,19 @@ void MDLImporter::InternReadFile( const std::string& pFile,
throw DeadlyImportError( "MDL File is too small."); throw DeadlyImportError( "MDL File is too small.");
} }
// delete the file buffer and cleanup.
auto DeleteBufferAndCleanup = [&]() {
if (mBuffer) {
delete [] mBuffer;
mBuffer = nullptr;
}
AI_DEBUG_INVALIDATE_PTR(pIOHandler);
AI_DEBUG_INVALIDATE_PTR(pScene);
};
try {
// 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
mBuffer =new unsigned char[iFileSize+1]; mBuffer = new unsigned char[iFileSize+1];
file->Read( (void*)mBuffer, 1, iFileSize); file->Read( (void*)mBuffer, 1, iFileSize);
// Append a binary zero to the end of the buffer. // Append a binary zero to the end of the buffer.
@ -261,11 +272,11 @@ void MDLImporter::InternReadFile( const std::string& pFile,
pScene->mRootNode->mTransformation = aiMatrix4x4(1.f,0.f,0.f,0.f, pScene->mRootNode->mTransformation = aiMatrix4x4(1.f,0.f,0.f,0.f,
0.f,0.f,1.f,0.f,0.f,-1.f,0.f,0.f,0.f,0.f,0.f,1.f); 0.f,0.f,1.f,0.f,0.f,-1.f,0.f,0.f,0.f,0.f,0.f,1.f);
// delete the file buffer and cleanup DeleteBufferAndCleanup();
delete [] mBuffer; } catch(...) {
mBuffer= nullptr; DeleteBufferAndCleanup();
AI_DEBUG_INVALIDATE_PTR(pIOHandler); throw;
AI_DEBUG_INVALIDATE_PTR(pScene); }
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------