[[ Bug 20269 ]] Error when dispatch cmd has 'with' and no params

livecodeali · livecodeali · commit 9c91998bf183 · 2018-02-16T15:28:34.000Z
(cherry picked from commit 074ab57)
diff --git a/docs/notes/bugfix-20269.md b/docs/notes/bugfix-20269.md
@@ -0,0 +1 @@
+# Throw parse error when dispatch ... with has empty params
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -457,7 +457,7 @@ Parse_stat MCDispatchCmd::parse(MCScriptPoint& sp)
 	
 	if (sp . skip_token(SP_REPEAT, TT_UNDEFINED, RF_WITH) == PS_NORMAL)
 	{
-		if (getparams(sp, &params) != PS_NORMAL)
+		if (sp.is_eol() || getparams(sp, &params) != PS_NORMAL)
 		{
 			MCperror -> add(PE_DISPATCH_BADPARAMS, sp);
 			return PS_ERROR;
diff --git a/engine/src/scriptpt.h b/engine/src/scriptpt.h
@@ -136,6 +136,14 @@ class MCScriptPoint
         
         return uindex_t(index);
     }
+    
+    bool is_eol()
+    {
+        Symbol_type t_dummy;
+        Parse_stat t_stat = next(t_dummy);
+        backup();
+        return t_stat == PS_EOL;
+    }
 
 	Parse_stat skip_space();
 	Parse_stat skip_eol();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Throw parse error when dispatch ... with has empty params`
Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ Parse_stat MCDispatchCmd::parse(MCScriptPoint& sp)`
`457`	`457`
`458`	`458`	`if (sp . skip_token(SP_REPEAT, TT_UNDEFINED, RF_WITH) == PS_NORMAL)`
`459`	`459`	`{`
`460`		`- if (getparams(sp, &params) != PS_NORMAL)`
	`460`	`+ if (sp.is_eol() \|\| getparams(sp, &params) != PS_NORMAL)`
`461`	`461`	`{`
`462`	`462`	`MCperror -> add(PE_DISPATCH_BADPARAMS, sp);`
`463`	`463`	`return PS_ERROR;`