Mercurial > vim
changeset 28499:a35d54d01ade v8.2.4774
patch 8.2.4774: crash when using a number for lambda name
Commit: https://github.com/vim/vim/commit/8b91e71441069b1dde9ac9ff9d9a829b1b4aecca
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 17 15:06:35 2022 +0100
patch 8.2.4774: crash when using a number for lambda name
Problem: Crash when using a number for lambda name.
Solution: Check the type of the lambda reference.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 17 Apr 2022 16:15:03 +0200 |
parents | 581ec553914d |
children | 8d6728463e9f |
files | src/errors.h src/eval.c src/testdir/test_lambda.vim src/version.c |
diffstat | 4 files changed, 21 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -3259,3 +3259,7 @@ EXTERN char e_nfa_regexp_missing_value_i 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
--- a/src/eval.c +++ b/src/eval.c @@ -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) {
--- a/src/testdir/test_lambda.vim +++ b/src/testdir/test_lambda.vim @@ -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()