[[ Bug 12459 ]] Setting graphic effects to non-array value should work the same as setting them to 'empty'

runrevali · runrevali · commit 62ba098aab81 · 2014-05-22T09:57:04.000+01:00
diff --git a/docs/notes/bugfix-12459.md b/docs/notes/bugfix-12459.md
@@ -0,0 +1 @@
+# Setting any graphic effects to "none" crashes LC 7 dp3 
diff --git a/engine/src/bitmapeffect.cpp b/engine/src/bitmapeffect.cpp
@@ -954,7 +954,11 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
     bool t_is_array;
     t_is_array = MCNameIsEmpty(p_index);
 
-    if (t_is_array && p_value . type == kMCExecValueTypeValueRef && MCValueIsEmpty(p_value . valueref_value))
+    // AL-2014-05-21: [[ Bug 12459 ]] Ensure setting bitmap effect to anything
+    //  that isn't an array does the same as setting it to 'empty'.
+    if (p_value . type == kMCExecValueTypeValueRef &&
+        (MCValueIsEmpty(p_value . valueref_value) ||
+         (MCValueGetTypeCode(p_value . valueref_value) != kMCValueTypeCodeArray)))
     {
         if (self == nil || (self -> mask & (1 << t_type)) == 0)
         {
diff --git a/engine/src/gradient.cpp b/engine/src/gradient.cpp
@@ -953,7 +953,11 @@ bool MCGradientFillSetProperties(MCExecContext& ctxt, MCGradientFill*& x_gradien
     
 	uint4 tablesize = ELEMENTS(gradientprops);
 
-    if (p_value . type == kMCExecValueTypeValueRef && MCValueIsEmpty(p_value . valueref_value))
+    // AL-2014-05-21: [[ Bug 12459 ]] Ensure setting gradient property to anything
+    //  that isn't an array does the same as setting it to 'empty'.
+    if (p_value . type == kMCExecValueTypeValueRef &&
+        (MCValueIsEmpty(p_value . valueref_value) ||
+         (MCValueGetTypeCode(p_value . valueref_value) != kMCValueTypeCodeArray)))
     {
         delete t_gradient;
         t_gradient = nil;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Setting any graphic effects to "none" crashes LC 7 dp3`
Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,11 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`954`	`954`	`bool t_is_array;`
`955`	`955`	`t_is_array = MCNameIsEmpty(p_index);`
`956`	`956`
`957`		`- if (t_is_array && p_value . type == kMCExecValueTypeValueRef && MCValueIsEmpty(p_value . valueref_value))`
	`957`	`+ // AL-2014-05-21: [[ Bug 12459 ]] Ensure setting bitmap effect to anything`
	`958`	`+ // that isn't an array does the same as setting it to 'empty'.`
	`959`	`+ if (p_value . type == kMCExecValueTypeValueRef &&`
	`960`	`+ (MCValueIsEmpty(p_value . valueref_value) \|\|`
	`961`	`+ (MCValueGetTypeCode(p_value . valueref_value) != kMCValueTypeCodeArray)))`
`958`	`962`	`{`
`959`	`963`	`if (self == nil \|\| (self -> mask & (1 << t_type)) == 0)`
`960`	`964`	`{`