[[ Bug 13804 ]] Crash freeing invalid palette struct

runrevali · runrevali · commit af429c417332 · 2014-10-27T12:42:00.000Z
diff --git a/docs/notes/bugfix-13804.md b/docs/notes/bugfix-13804.md
@@ -0,0 +1 @@
+# export snapshot crashes LC7GM 1 
diff --git a/engine/src/cmdsf.cpp b/engine/src/cmdsf.cpp
@@ -1469,9 +1469,14 @@ void MCExport::exec_ctxt(MCExecContext &ctxt)
         t_settings_ptr = &t_settings;
         break;
     case kMCImagePaletteTypeEmpty:
+        t_settings . type = kMCImagePaletteTypeEmpty;
         break;
     }
 
+    // AL-2014-10-27: [[ Bug 13804 ]] Make sure execution stops here if there was an error creating palette settings
+    if (ctxt . HasError())
+        return;
+    
     bool t_success;
     t_success = true;
     if (sformat == EX_SNAPSHOT)
@@ -1537,9 +1542,6 @@ void MCExport::exec_ctxt(MCExecContext &ctxt)
     
     MCInterfaceImagePaletteSettingsFree(ctxt, t_settings);
 
-    if (ctxt . HasError())
-        return;
-
 	if (*t_return_data != nil)
 	{
         dest->set(ctxt, PT_INTO, *t_return_data);
