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.
diff --git a/src/errors.h b/src/errors.h
index b95644a..0c61340 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3259,3 +3259,7 @@
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
diff --git a/src/eval.c b/src/eval.c
index cad6887..61b09fb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4102,19 +4102,23 @@
++*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)
{
diff --git a/src/testdir/test_lambda.vim b/src/testdir/test_lambda.vim
index e6dcb67..8d06e59 100644
--- a/src/testdir/test_lambda.vim
+++ b/src/testdir/test_lambda.vim
@@ -66,6 +66,10 @@
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()
diff --git a/src/version.c b/src/version.c
index bdefc25..43e85e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4774,
+/**/
4773,
/**/
4772,