Merge pull request #5448 from runrevmark/bugfix-19681

livecodepanos · web-flow · commit 661ce1f8d44f · 2017-05-11T12:49:01.000+01:00
[[ Bug 19681 ]] Ensure targetptr check is only done if valid before
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -246,6 +246,10 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
 
 	if ((stat == ES_NOT_HANDLED || stat == ES_PASS) && m_externals != nil)
 	{
+        // TODO[19681]: This can be removed when all engine messages are sent with
+        // target.
+        bool t_target_was_valid = MCtargetptr.IsValid();
+    
 		Exec_stat oldstat = stat;
 		stat = m_externals -> Handle(this, htype, mess, params);
 
@@ -259,7 +263,7 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
         
         if (stat == ES_PASS || stat == ES_NOT_HANDLED)
         {
-            if (!MCtargetptr.IsValid())
+            if (t_target_was_valid && !MCtargetptr.IsValid())
             {
                 stat = ES_NORMAL;
                 t_has_passed = false;
@@ -292,12 +296,16 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
 
     if ((stat == ES_NOT_HANDLED || stat == ES_PASS))
     {
+        // TODO[19681]: This can be removed when all engine messages are sent with
+        // target.
+        bool t_target_was_valid = MCtargetptr.IsValid();
+        
         extern Exec_stat MCEngineHandleLibraryMessage(MCNameRef name, MCParameter *params);
         stat = MCEngineHandleLibraryMessage(mess, params);
         
         if (stat == ES_PASS || stat == ES_NOT_HANDLED)
         {
-            if (!MCtargetptr.IsValid())
+            if (t_target_was_valid && !MCtargetptr.IsValid())
             {
                 stat = ES_NORMAL;
                 t_has_passed = false;
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -1077,6 +1077,10 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,
 	Exec_stat t_stat;
 	t_stat = ES_NOT_HANDLED;
 
+    // TODO[19681]: This can be removed when all engine messages are sent with
+    // target.
+    bool t_target_was_valid = MCtargetptr.IsValid();
+    
 	MCObjectExecutionLock self_lock(this);
 
 	// Make sure this object has its script compiled.
@@ -1140,7 +1144,7 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,
     
     if (t_stat == ES_PASS || t_stat == ES_NOT_HANDLED)
     {
-        if (!MCtargetptr.IsValid())
+        if (t_target_was_valid && !MCtargetptr.IsValid())
         {
             t_main_stat = ES_NORMAL;
         }
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -1592,13 +1592,17 @@ Exec_stat MCStack::handle(Handler_type htype, MCNameRef message, MCParameter *pa
 
 	if (((passing_object != nil && stat == ES_PASS) || stat == ES_NOT_HANDLED) && m_externals != nil)
 	{
+        // TODO[19681]: This can be removed when all engine messages are sent with
+        // target.
+        bool t_target_was_valid = MCtargetptr.IsValid();
+        
 		Exec_stat oldstat = stat;
 		stat = m_externals -> Handle(this, htype, message, params);
 		if (oldstat == ES_PASS && stat == ES_NOT_HANDLED)
 			stat = ES_PASS;
         if (stat == ES_PASS || stat == ES_NOT_HANDLED)
         {
-            if (!MCtargetptr.IsValid())
+            if (t_target_was_valid && !MCtargetptr.IsValid())
             {
                 stat = ES_NORMAL;
             }

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,10 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa`
`246`	`246`
`247`	`247`	`if ((stat == ES_NOT_HANDLED \|\| stat == ES_PASS) && m_externals != nil)`
`248`	`248`	`{`
	`249`	`+ // TODO[19681]: This can be removed when all engine messages are sent with`
	`250`	`+ // target.`
	`251`	`+ bool t_target_was_valid = MCtargetptr.IsValid();`
	`252`	`+`
`249`	`253`	`Exec_stat oldstat = stat;`
`250`	`254`	`stat = m_externals -> Handle(this, htype, mess, params);`
`251`	`255`
`@@ -259,7 +263,7 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa`
`259`	`263`
`260`	`264`	`if (stat == ES_PASS \|\| stat == ES_NOT_HANDLED)`
`261`	`265`	`{`
`262`		`- if (!MCtargetptr.IsValid())`
	`266`	`+ if (t_target_was_valid && !MCtargetptr.IsValid())`
`263`	`267`	`{`
`264`	`268`	`stat = ES_NORMAL;`
`265`	`269`	`t_has_passed = false;`
`@@ -292,12 +296,16 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa`
`292`	`296`
`293`	`297`	`if ((stat == ES_NOT_HANDLED \|\| stat == ES_PASS))`
`294`	`298`	`{`
	`299`	`+ // TODO[19681]: This can be removed when all engine messages are sent with`
	`300`	`+ // target.`
	`301`	`+ bool t_target_was_valid = MCtargetptr.IsValid();`
	`302`	`+`
`295`	`303`	`extern Exec_stat MCEngineHandleLibraryMessage(MCNameRef name, MCParameter *params);`
`296`	`304`	`stat = MCEngineHandleLibraryMessage(mess, params);`
`297`	`305`
`298`	`306`	`if (stat == ES_PASS \|\| stat == ES_NOT_HANDLED)`
`299`	`307`	`{`
`300`		`- if (!MCtargetptr.IsValid())`
	`308`	`+ if (t_target_was_valid && !MCtargetptr.IsValid())`
`301`	`309`	`{`
`302`	`310`	`stat = ES_NORMAL;`
`303`	`311`	`t_has_passed = false;`
Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,10 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,`
`1077`	`1077`	`Exec_stat t_stat;`
`1078`	`1078`	`t_stat = ES_NOT_HANDLED;`
`1079`	`1079`
	`1080`	`+ // TODO[19681]: This can be removed when all engine messages are sent with`
	`1081`	`+ // target.`
	`1082`	`+ bool t_target_was_valid = MCtargetptr.IsValid();`
	`1083`	`+`
`1080`	`1084`	`MCObjectExecutionLock self_lock(this);`
`1081`	`1085`
`1082`	`1086`	`// Make sure this object has its script compiled.`
`@@ -1140,7 +1144,7 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,`
`1140`	`1144`
`1141`	`1145`	`if (t_stat == ES_PASS \|\| t_stat == ES_NOT_HANDLED)`
`1142`	`1146`	`{`
`1143`		`- if (!MCtargetptr.IsValid())`
	`1147`	`+ if (t_target_was_valid && !MCtargetptr.IsValid())`
`1144`	`1148`	`{`
`1145`	`1149`	`t_main_stat = ES_NORMAL;`
`1146`	`1150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1592,13 +1592,17 @@ Exec_stat MCStack::handle(Handler_type htype, MCNameRef message, MCParameter *pa`
`1592`	`1592`
`1593`	`1593`	`if (((passing_object != nil && stat == ES_PASS) \|\| stat == ES_NOT_HANDLED) && m_externals != nil)`
`1594`	`1594`	`{`
	`1595`	`+ // TODO[19681]: This can be removed when all engine messages are sent with`
	`1596`	`+ // target.`
	`1597`	`+ bool t_target_was_valid = MCtargetptr.IsValid();`
	`1598`	`+`
`1595`	`1599`	`Exec_stat oldstat = stat;`
`1596`	`1600`	`stat = m_externals -> Handle(this, htype, message, params);`
`1597`	`1601`	`if (oldstat == ES_PASS && stat == ES_NOT_HANDLED)`
`1598`	`1602`	`stat = ES_PASS;`
`1599`	`1603`	`if (stat == ES_PASS \|\| stat == ES_NOT_HANDLED)`
`1600`	`1604`	`{`
`1601`		`- if (!MCtargetptr.IsValid())`
	`1605`	`+ if (t_target_was_valid && !MCtargetptr.IsValid())`
`1602`	`1606`	`{`
`1603`	`1607`	`stat = ES_NORMAL;`
`1604`	`1608`	`}`