patch 8.2.2802: Vim9: illegal memory access
Problem: Vim9: illegal memory access.
Solution: Check for comment before checking for white space. (closes #8142)
diff --git a/src/eval.c b/src/eval.c
index a9f5ae6..fbf4f57 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2083,7 +2083,8 @@
* If inside Vim9 script, "arg" points to the end of a line (ignoring a #
* comment) and there is a next line, return the next line (skipping blanks)
* and set "getnext".
- * Otherwise just return "arg" unmodified and set "getnext" to FALSE.
+ * Otherwise return the next non-white at or after "arg" and set "getnext" to
+ * FALSE.
* "arg" must point somewhere inside a line, not at the start.
*/
char_u *
@@ -2095,7 +2096,7 @@
if (in_vim9script()
&& evalarg != NULL
&& (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL)
- && (*p == NUL || (VIM_ISWHITE(p[-1]) && vim9_comment_start(p))))
+ && (*p == NUL || (vim9_comment_start(p) && VIM_ISWHITE(p[-1]))))
{
char_u *next;
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index a941a61..8cfb160 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -2692,5 +2692,15 @@
CheckDefExecAndScriptFailure(lines, 'E1106: One argument too many', 1)
enddef
+def Test_closing_brace_at_start_of_line()
+ var lines =<< trim END
+ def Func()
+ enddef
+ Func(
+ )
+ END
+ call CheckDefAndScriptSuccess(lines)
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index a345fc8..0918d5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2802,
+/**/
2801,
/**/
2800,