diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 14:42:31 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 14:43:31 +0100 |
commit | 78b22393a8dd182ee56d0448ed77ba4430de5e75 (patch) | |
tree | b117ded652a479692041ba5cafba15cfc2a754b5 /thirdparty/assimp/code/FBX/FBXParser.cpp | |
parent | 9d8a9ea826ac733e7076d567ef2a6b5200de68c4 (diff) | |
download | redot-engine-78b22393a8dd182ee56d0448ed77ba4430de5e75.tar.gz |
assimp: Sync with upstream 0201fc5
Diffstat (limited to 'thirdparty/assimp/code/FBX/FBXParser.cpp')
-rw-r--r-- | thirdparty/assimp/code/FBX/FBXParser.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/thirdparty/assimp/code/FBX/FBXParser.cpp b/thirdparty/assimp/code/FBX/FBXParser.cpp index 4a9346040d..aef59d60ca 100644 --- a/thirdparty/assimp/code/FBX/FBXParser.cpp +++ b/thirdparty/assimp/code/FBX/FBXParser.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2019, assimp team +Copyright (c) 2006-2020, assimp team All rights reserved. @@ -367,9 +367,13 @@ float ParseTokenAsFloat(const Token& t, const char*& err_out) // first - next in the fbx token stream comes ',', // which fast_atof could interpret as decimal point. #define MAX_FLOAT_LENGTH 31 - char temp[MAX_FLOAT_LENGTH + 1]; const size_t length = static_cast<size_t>(t.end()-t.begin()); - std::copy(t.begin(),t.end(),temp); + if (length > MAX_FLOAT_LENGTH) { + return 0.f; + } + + char temp[MAX_FLOAT_LENGTH + 1]; + std::copy(t.begin(), t.end(), temp); temp[std::min(static_cast<size_t>(MAX_FLOAT_LENGTH),length)] = '\0'; return fast_atof(temp); |