Merge branch 'master' into fix-gltf-bin-from-memory

2020-12-30 11:17:31 +01:00 · 2020-12-30 11:17:31 +01:00 · e0803b3ec2
parent ca653e0c6a 3ccfc03c48
commit e0803b3ec2
1 changed files with 5 additions and 0 deletions
--- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@ -375,6 +375,11 @@ bool ReadScope(TokenList& output_tokens, const char* input, const char*& cursor,

    // now come the individual properties
    const char* begin_cursor = cursor;
+
+    if ((begin_cursor + prop_length) > end) {
+        TokenizeError("property length out of bounds reading length ", input, cursor);
+    }
+
    for (unsigned int i = 0; i < prop_count; ++i) {
        ReadData(sbeg, send, input, cursor, begin_cursor + prop_length);