diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-16 09:39:06 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-16 09:39:06 +0100 |
| commit | 6a04bf5ee523b2d6d01d7290e356a30de219f465 (patch) | |
| tree | 65312ca88f606153a853c89063efc51bfdc5b2d5 | |
| parent | 20eaf8b78d9724fbcd8d55bff9f2fb5cc8c2ff08 (diff) | |
patch 9.1.0182: Can define function with invalid name inside 'formatexpr'v9.1.0182
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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_user_func.vim | 19 | ||||
| -rw-r--r-- | src/userfunc.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim index 57a093c9c9..992329bc72 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 00e499fd0f..ce144a3978 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 36c1205777..9f78196322 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 182, +/**/ 181, /**/ 180, |