Browse Source

Merge pull request #3898 from JC3/patch-2

Reapply [amf] Fix crash when file could not be parsed.
Kim Kulling 4 years ago
parent
commit
f197e93035
1 changed files with 2 additions and 1 deletions
  1. 2 1
      code/AssetLib/AMF/AMFImporter.cpp

+ 2 - 1
code/AssetLib/AMF/AMFImporter.cpp

@@ -268,7 +268,8 @@ void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
     mXmlParser = new XmlParser();
     if (!mXmlParser->parse(file.get())) {
         delete mXmlParser;
-        throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
+        mXmlParser = nullptr;
+        throw DeadlyImportError("Failed to create XML reader for file ", pFile, ".");
     }
 
     // Start reading, search for root tag <amf>