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

patch 8.2.4774: crash when using a number for lambda name

Browse Source 
Problem:    Crash when using a number for lambda name.
Solution:   Check the type of the lambda reference.
This commit is contained in:
Bram Moolenaar
2022-04-17 15:06:35 +01:00
parent a9549c9e8f
commit 8b91e71441
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/errors.h
View File

@@ -3259,3 +3259,7 @@ EXTERN char e_nfa_regexp_missing_value_in_chr[]
INIT(= N_("E1273: (NFA regexp) missing value in '\\%%%c'"));
EXTERN char e_no_script_file_name_to_substitute_for_script[]
INIT(= N_("E1274: No script file name to substitute for \"<script>\""));
#ifdef FEAT_EVAL
EXTERN char e_string_or_function_required_for_arrow_parens_expr[]
INIT(= N_("E1275: String or function required for ->(expr)"));
#endif

18
src/eval.c
View File

@@ -4102,19 +4102,23 @@ eval_lambda(
++*arg;
ret = eval1(arg, rettv, evalarg);
*arg = skipwhite_and_linebreak(*arg, evalarg);
if (**arg == ')')
{
++*arg;
}
else
if (**arg != ')')
{
emsg(_(e_missing_closing_paren));
ret = FAIL;
return FAIL;
}
if (rettv->v_type != VAR_STRING && rettv->v_type != VAR_FUNC
&& rettv->v_type != VAR_PARTIAL)
{
emsg(_(e_string_or_function_required_for_arrow_parens_expr));
return FAIL;
}
++*arg;
}
if (ret != OK)
return FAIL;
else if (**arg != '(')
if (**arg != '(')
{
if (verbose)
{

4
src/testdir/test_lambda.vim
View File

@@ -66,6 +66,10 @@ function Test_lambda_fails()
echo assert_fails('echo 10->{a -> a + 2}', 'E107:')
call assert_fails('eval 0->(', "E110: Missing ')'")
call assert_fails('eval 0->(3)()', "E1275:")
call assert_fails('eval 0->([3])()', "E1275:")
call assert_fails('eval 0->({"a": 3})()', "E1275:")
call assert_fails('eval 0->(xxx)()', "E121:")
endfunc
func Test_not_lamda()

2
src/version.c
View File

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