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

Merge pull request #4801 from jakrams/fbx-out-of-memory-fix 

Don't hide out-of-memory during FBX import
pull/4787/head^2
Kim Kulling 2022-11-18 20:40:59 +01:00 committed by GitHub
parent 11fe77c446 08f2f0f82f
commit 6392dbfe4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,14 @@ const Object* LazyObject::Get(bool dieOnError) {
object.reset(new AnimationCurveNode(id,element,name,doc)); object.reset(new AnimationCurveNode(id,element,name,doc));
} }
} }
catch (std::bad_alloc&) {
// out-of-memory is unrecoverable and should always lead to a failure
flags &= ~BEING_CONSTRUCTED;
flags |= FAILED_TO_CONSTRUCT;
throw;
}
catch(std::exception& ex) { catch(std::exception& ex) {
flags &= ~BEING_CONSTRUCTED; flags &= ~BEING_CONSTRUCTED;
flags |= FAILED_TO_CONSTRUCT; flags |= FAILED_TO_CONSTRUCT;