'go to <...> as <number>' parsing bug fixed

livecodesebastien · livecodesebastien · commit 62bb2db4a82d · 2014-06-16T15:20:53.000+01:00
bugfix 12648 applied to 7.0
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -184,11 +184,10 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
 					        || sp.lookup(SP_COMMAND, te) != PS_NORMAL
 					        || te->type != TT_STATEMENT)
 					{
-						uint2 newmode;
                         MCAutoNumberRef t_mode;
 
                         if (!MCNumberParse(sp.gettoken_stringref(), &t_mode)
-						        || newmode < 1 || newmode >= WM_LAST)
+						        || MCNumberFetchAsInteger(*t_mode) < 1 || MCNumberFetchAsInteger(*t_mode) >= WM_LAST)
 						{
 							MCperror->add
 							(PE_GO_NOMODE, sp);
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -3907,7 +3907,9 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
         siStartInfo.hStdOutput = hChildStdoutWr;
         
 		MCStringRef t_cmd;
-		/* UNCHECKED */ MCStringFormat(t_cmd, "%@ /C %@", MCshellcmd, p_command);
+        // SN-2014-06-16 [[ Bug 12648 ]] Shell command does not accept spaces despite being quoted (Windows)
+        // Fix for 7
+		/* UNCHECKED */ MCStringFormat(t_cmd, "%@ /C \"%@\"", MCshellcmd, p_command);
 		MCAutoStringRefAsWString t_wcmd;
 		t_wcmd . Lock(t_cmd);
         MCU_realloc((char **)&MCprocesses, MCnprocesses,

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,10 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)`
`184`	`184`	`\|\| sp.lookup(SP_COMMAND, te) != PS_NORMAL`
`185`	`185`	`\|\| te->type != TT_STATEMENT)`
`186`	`186`	`{`
`187`		`- uint2 newmode;`
`188`	`187`	`MCAutoNumberRef t_mode;`
`189`	`188`
`190`	`189`	`if (!MCNumberParse(sp.gettoken_stringref(), &t_mode)`
`191`		`- \|\| newmode < 1 \|\| newmode >= WM_LAST)`
	`190`	`+ \|\| MCNumberFetchAsInteger(t_mode) < 1 \|\| MCNumberFetchAsInteger(t_mode) >= WM_LAST)`
`192`	`191`	`{`
`193`	`192`	`MCperror->add`
`194`	`193`	`(PE_GO_NOMODE, sp);`