Merge branch 'master' into master

2022-08-12 14:09:04 +02:00 · 2022-08-12 14:09:04 +02:00 · baf14f6c16
parent 253f8bfa62 888468e8f7
commit baf14f6c16
1 changed files with 3 additions and 1 deletions
--- a/code/AssetLib/ASE/ASEParser.cpp
+++ b/code/AssetLib/ASE/ASEParser.cpp
@ -74,7 +74,7 @@ using namespace Assimp::ASE;
            return;                                \
        }                                          \
    }                                              \
-    else if ('\0' == *filePtr) {                   \
+    if ('\0' == *filePtr) {                        \
        return;                                    \
    }                                              \
    if (IsLineEnd(*filePtr) && !bLastWasEndLine) { \
@ -420,6 +420,8 @@ void Parser::ParseLV1SoftSkinBlock() {
                }
            }
        }
+        if (*filePtr == '\0')
+            return;
        ++filePtr;
        SkipSpacesAndLineEnd(&filePtr);
    }