patch 8.2.1687: Vim9: out of bounds error

brammool · brammool · commit 9b123d859053 · 2020-09-14T22:39:11.000+02:00
Problem:    Vim9: out of bounds error.
Solution:   Check that cmdidx is not negative.
diff --git a/src/version.c b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1687,
 /**/
     1686,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
@@ -6903,7 +6903,8 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
 	if (ea.cmdidx != CMD_SIZE
 			    && ea.cmdidx != CMD_write && ea.cmdidx != CMD_read)
 	{
-	    ea.argt = excmd_get_argt(ea.cmdidx);
+	    if (ea.cmdidx >= 0)
+		ea.argt = excmd_get_argt(ea.cmdidx);
 	    if ((ea.argt & EX_BANG) && *p == '!')
 	    {
 		ea.forceit = TRUE;

Original file line number	Diff line number	Diff line change
`@@ -6903,7 +6903,8 @@ compile_def_function(ufunc_T ufunc, int set_return_type, cctx_T outer_cctx)`
`6903`	`6903`	`if (ea.cmdidx != CMD_SIZE`
`6904`	`6904`	`&& ea.cmdidx != CMD_write && ea.cmdidx != CMD_read)`
`6905`	`6905`	`{`
`6906`		`- ea.argt = excmd_get_argt(ea.cmdidx);`
	`6906`	`+ if (ea.cmdidx >= 0)`
	`6907`	`+ ea.argt = excmd_get_argt(ea.cmdidx);`
`6907`	`6908`	`if ((ea.argt & EX_BANG) && *p == '!')`
`6908`	`6909`	`{`
`6909`	`6910`	`ea.forceit = TRUE;`