Merge pull request livecode#6686 from livecodepanos/bugfix-21582

livecodepanos · web-flow · commit 5f058e3fd399 · 2018-10-15T13:32:23.000+01:00
[21582] Fix crash when saving a stack that has a colorswatch widget
diff --git a/docs/notes/bugfix-21582.md b/docs/notes/bugfix-21582.md
@@ -0,0 +1 @@
+# Fix crash and stack corruption when opening a stack that has a colorswatch widget
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -810,7 +810,12 @@ IO_stat MCWidget::save(IO_handle p_stream, uint4 p_part, bool p_force_ext, uint3
     // Make the widget generate a rep.
 	MCAutoValueRef t_rep;
 	if (m_widget != nil)
+    {
 		MCWidgetOnSave(m_widget, &t_rep);
+        // A widget might not have an OnSave handler (e.g. colorswatch widget)
+        if (*t_rep == nil)
+            t_rep = kMCNull;
+    }
 	else if (m_rep != nil)
 		t_rep = m_rep;
 	else

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash and stack corruption when opening a stack that has a colorswatch widget`