0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 8.2.3847: illegal memory access when using a lambda with an error

Problem:    Illegal memory access when using a lambda with an error.
Solution:   Avoid skipping over the NUL after a string.
This commit is contained in:
Bram Moolenaar
2021-12-18 16:54:31 +00:00
parent 60618c8f1a
commit 605ec91e5a
3 changed files with 9 additions and 2 deletions

View File

@@ -3871,12 +3871,15 @@ eval_lambda(
++*arg; ++*arg;
ret = eval1(arg, rettv, evalarg); ret = eval1(arg, rettv, evalarg);
*arg = skipwhite_and_linebreak(*arg, evalarg); *arg = skipwhite_and_linebreak(*arg, evalarg);
if (**arg != ')') if (**arg == ')')
{
++*arg;
}
else
{ {
emsg(_(e_missing_closing_paren)); emsg(_(e_missing_closing_paren));
ret = FAIL; ret = FAIL;
} }
++*arg;
} }
if (ret != OK) if (ret != OK)
return FAIL; return FAIL;

View File

@@ -64,6 +64,8 @@ function Test_lambda_fails()
call assert_fails('echo {a, a -> a + a}(1, 2)', 'E853:') call assert_fails('echo {a, a -> a + a}(1, 2)', 'E853:')
call assert_fails('echo {a, b -> a + b)}(1, 2)', 'E451:') call assert_fails('echo {a, b -> a + b)}(1, 2)', 'E451:')
echo assert_fails('echo 10->{a -> a + 2}', 'E107:') echo assert_fails('echo 10->{a -> a + 2}', 'E107:')
call assert_fails('eval 0->(', "E110: Missing ')'")
endfunc endfunc
func Test_not_lamda() func Test_not_lamda()

View File

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