From 6a04bf5ee523b2d6d01d7290e356a30de219f465 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 16 Mar 2024 09:39:06 +0100 Subject: [PATCH] patch 9.1.0182: Can define function with invalid name inside 'formatexpr' Problem: Can define function with invalid name inside 'formatexpr'. Solution: Use goto instead of checking for did_emsg later. (zeertzjq) closes: #14209 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- src/testdir/test_user_func.vim | 19 +++++++++++++++++++ src/userfunc.c | 3 +++ src/version.c | 2 ++ 3 files changed, 24 insertions(+) diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim index 57a093c9c..992329bc7 100644 --- a/src/testdir/test_user_func.vim +++ b/src/testdir/test_user_func.vim @@ -968,4 +968,23 @@ func Test_multidefer_with_exception() delfunc Foo endfunc +func Test_func_curly_brace_invalid_name() + func Fail() + func Foo{'()'}bar() + endfunc + endfunc + + call assert_fails('call Fail()', 'E475: Invalid argument: Foo()bar') + + silent! call Fail() + call assert_equal([], getcompletion('Foo', 'function')) + + set formatexpr=Fail() + normal! gqq + call assert_equal([], getcompletion('Foo', 'function')) + + set formatexpr& + delfunc Fail +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/userfunc.c b/src/userfunc.c index 00e499fd0..ce144a397 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -4977,7 +4977,10 @@ define_function( : eval_isnamec(name_base[i])); ++i) ; if (name_base[i] != NUL) + { emsg_funcname(e_invalid_argument_str, arg); + goto ret_free; + } // In Vim9 script a function cannot have the same name as a // variable. diff --git a/src/version.c b/src/version.c index 36c120577..9f7819632 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 182, /**/ 181, /**/