0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.2802: Vim9: illegal memory access

Problem:    Vim9: illegal memory access.
Solution:   Check for comment before checking for white space. (closes #8142)
This commit is contained in:
Bram Moolenaar
2021-04-23 19:32:23 +02:00
parent f6d9935a13
commit a6aa16423f
3 changed files with 15 additions and 2 deletions

View File

@@ -2083,7 +2083,8 @@ getline_peek_skip_comments(evalarg_T *evalarg)
* 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 @@ eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext)
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;

View File

@@ -2692,5 +2692,15 @@ def Test_too_many_arguments()
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

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2802,
/**/
2801,
/**/