Merge branch 'master' into 6520123362508800

2023-06-13 22:06:08 +02:00
parent f5683b6f3a 4180b1fd08
commit f897b0c461
11 changed files with 297 additions and 140 deletions
--- a/code/AssetLib/MDL/MDLMaterialLoader.cpp
+++ b/code/AssetLib/MDL/MDLMaterialLoader.cpp
@@ -703,7 +703,14 @@ void MDLImporter::SkipSkinLump_3DGS_MDL7(
            tex.pcData = bad_texel;
            tex.mHeight = iHeight;
            tex.mWidth = iWidth;
-            ParseTextureColorData(szCurrent, iMasked, &iSkip, &tex);
+
+            try {
+                ParseTextureColorData(szCurrent, iMasked, &iSkip, &tex);
+            } catch (...) {
+                // FIX: Important, otherwise the destructor will crash
+                tex.pcData = nullptr;
+                throw;
+            }

            // FIX: Important, otherwise the destructor will crash
            tex.pcData = nullptr;