#4315 Crash in GLTF uploader

Properly handle importer's crashes in general

1 files changed, 26 insertions, 1 deletions

diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index 71bfc021d3..bb6a0a590c 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -124,7 +124,32 @@ bool LLGLTFLoader::OpenFile(const std::string &filename)
     std::string filename_lc(filename);
     LLStringUtil::toLower(filename_lc);
 
-    mGltfLoaded = mGLTFAsset.load(filename, false);
+    try
+    {
+        mGltfLoaded = mGLTFAsset.load(filename, false);
+    }
+    catch (const std::exception& e)
+    {
+        LL_WARNS() << "Exception in LLModelLoader::run: " << e.what() << LL_ENDL;
+        LLSD args;
+        args["Message"] = "ParsingErrorException";
+        args["FILENAME"] = filename;
+        args["EXCEPTION"] = e.what();
+        mWarningsArray.append(args);
+        setLoadState(ERROR_PARSING);
+        return false;
+    }
+    catch (...)
+    {
+        LOG_UNHANDLED_EXCEPTION("LLGLTFLoader");
+        LLSD args;
+        args["Message"] = "ParsingErrorException";
+        args["FILENAME"] = filename;
+        args["EXCEPTION"] = "Unknown exception";
+        mWarningsArray.append(args);
+        setLoadState(ERROR_PARSING);
+        return false;
+    }
 
     if (!mGltfLoaded)
     {