[[ Bug 13110 ]] Debugger triggers when using 'do'.

runrevmark · runrevmark · commit 2677d39e678e · 2015-03-03T16:52:27.000Z
The debugger will trigger a breakpoint on the first few lines of a script when a do is executed in the context of the same object.

Essentially, the check for breakpoints gets confused in this case so if you do script has 3 lines, and you have a breakpoint in the first 3 lines of the objects script, you'll get a debug-break action.

This has been fixed by guarding MCB_trace against doing anything if within a handler called 'message' - which is what do uses for this purpose.
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -269,8 +269,13 @@ void MCB_prepmessage(MCExecContext &ctxt, MCNameRef mess, uint2 line, uint2 pos,
 void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)
 {
 	uint2 i;
-
-	if (MCtrace && (MCtraceuntil == MAXUINT2 || MCnexecutioncontexts == MCtraceuntil))
+    
+    // MW-2015-03-03: [[ Bug 13110 ]] If this is an internal handler as a result of do
+    //   then *don't* debug it.
+    if (ctxt . GetHandler() -> getname() == MCM_message)
+        return;
+	
+    if (MCtrace && (MCtraceuntil == MAXUINT2 || MCnexecutioncontexts == MCtraceuntil))
 	{
 		MCtraceuntil = MAXUINT2;
 		MCB_prepmessage(ctxt, MCM_trace, line, pos, 0);
@@ -285,9 +290,9 @@ void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)
 			{
 				MCParentScriptUse *t_parentscript;
 				t_parentscript = ctxt . GetParentScript();
-				if (t_parentscript == NULL && MCbreakpoints[i].object == ctxt.GetObject() ||
-					t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject())
-				MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
+				if ((t_parentscript == NULL && MCbreakpoints[i].object == ctxt.GetObject()) ||
+					(t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))
+                    MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
 			}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,13 @@ void MCB_prepmessage(MCExecContext &ctxt, MCNameRef mess, uint2 line, uint2 pos,`
`269`	`269`	`void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)`
`270`	`270`	`{`
`271`	`271`	`uint2 i;`
`272`		`-`
`273`		`- if (MCtrace && (MCtraceuntil == MAXUINT2 \|\| MCnexecutioncontexts == MCtraceuntil))`
	`272`	`+`
	`273`	`+ // MW-2015-03-03: [[ Bug 13110 ]] If this is an internal handler as a result of do`
	`274`	`+ // then don't debug it.`
	`275`	`+ if (ctxt . GetHandler() -> getname() == MCM_message)`
	`276`	`+ return;`
	`277`	`+`
	`278`	`+ if (MCtrace && (MCtraceuntil == MAXUINT2 \|\| MCnexecutioncontexts == MCtraceuntil))`
`274`	`279`	`{`
`275`	`280`	`MCtraceuntil = MAXUINT2;`
`276`	`281`	`MCB_prepmessage(ctxt, MCM_trace, line, pos, 0);`
`@@ -285,9 +290,9 @@ void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)`
`285`	`290`	`{`
`286`	`291`	`MCParentScriptUse *t_parentscript;`
`287`	`292`	`t_parentscript = ctxt . GetParentScript();`
`288`		`- if (t_parentscript == NULL && MCbreakpoints[i].object == ctxt.GetObject() \|\|`
`289`		`- t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject())`
`290`		`- MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);`
	`293`	`+ if ((t_parentscript == NULL && MCbreakpoints[i].object == ctxt.GetObject()) \|\|`
	`294`	`+ (t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))`
	`295`	`+ MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);`
`291`	`296`	`}`
`292`	`297`	`}`
`293`	`298`	`}`