patch 8.2.4622: Vim9: crash with :execute and :finish
Problem: Vim9: Crash with :execute and :finish. (Sergey Vlasov)
Solution: Check for NULL. (closes #10011)
diff --git a/src/eval.c b/src/eval.c
index a963a15..4447186 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2144,7 +2144,8 @@
p = skipwhite(next);
if (*p != NUL && !vim9_comment_start(p))
return next;
- (void)eval_next_line(evalarg);
+ if (eval_next_line(evalarg) == NULL)
+ break;
}
return NULL;
}
@@ -2199,6 +2200,9 @@
GETLINE_CONCAT_ALL);
else
line = next_line_from_context(evalarg->eval_cctx, TRUE);
+ if (line == NULL)
+ return NULL;
+
++evalarg->eval_break_count;
if (gap->ga_itemsize > 0 && ga_grow(gap, 1) == OK)
{
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index b1b63d2..71cef1e 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1830,6 +1830,24 @@
v9.CheckScriptSuccess(lines)
enddef
+def Test_execute_finish()
+ # the empty lines are relevant here
+ var lines =<< trim END
+ vim9script
+
+ var vname = "g:hello"
+
+ if exists(vname) | finish | endif | execute vname '= "world"'
+
+ assert_equal('world', g:hello)
+
+ if exists(vname) | finish | endif | execute vname '= "world"'
+
+ assert_report('should not be reached')
+ END
+ v9.CheckScriptSuccess(lines)
+enddef
+
def Test_echo_cmd()
echo 'some' # comment
echon 'thing'
diff --git a/src/version.c b/src/version.c
index bcb70e8..d6edc46 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4622,
+/**/
4621,
/**/
4620,