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

Fix a leak in FBXDocument when duplicate object IDs are found 

When a duplicate ID is encountered, existing LazyObject is overwritten. Previously allocated instance leaks.

This change deletes the previously allocated instance before overwriting the pointer.
pull/4963/head
Anton Vaneev 2023-02-16 11:21:29 +01:00 committed by GitHub
parent 4950d02bac
commit 2cd3da4831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/FBX/FBXDocument.cpp
View File

@ -381,8 +381,10 @@ void Document::ReadObjects() {
DOMError("encountered object with implicitly defined id 0",el.second); DOMError("encountered object with implicitly defined id 0",el.second);
} }
if(objects.find(id) != objects.end()) { const auto foundObject = objects.find(id);
if(foundObject != objects.end()) {
DOMWarning("encountered duplicate object id, ignoring first occurrence",el.second); DOMWarning("encountered duplicate object id, ignoring first occurrence",el.second);
delete foundObject->second;
} }
objects[id] = new LazyObject(id, *el.second, *this); objects[id] = new LazyObject(id, *el.second, *this);