Browse Source

Merge pull request #4283 from assimp/kimkulling-avoid_invalid_string_access_issue4222

LWS-Import: Avoid access to empty string token
Kim Kulling 3 years ago
parent
commit
64af16c427
1 changed files with 5 additions and 0 deletions
  1. 5 0
      code/AssetLib/LWS/LWSLoader.cpp

+ 5 - 0
code/AssetLib/LWS/LWSLoader.cpp

@@ -537,6 +537,11 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // get file format version and print to log
     ++it;
+    
+    if ((*it).tokens[0].empty()) {
+        ASSIMP_LOG_ERROR("Invalid LWS file detectedm abort import.");
+        return;
+    }
     unsigned int version = strtoul10((*it).tokens[0].c_str());
     ASSIMP_LOG_INFO("LWS file format version is ", (*it).tokens[0]);
     first = 0.;