diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 09:44:13 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 09:45:56 +0800 |
| commit | acbfbbb649c39694c3a6a92160984db2fcb6f3ec (patch) | |
| tree | 90b720770b69ba92de50e079f929c810d96b7c07 | |
| parent | 9eaae3d56b8d44907da3286084d3ee7b50fe7a07 (diff) | |
| download | rneovim-acbfbbb649c39694c3a6a92160984db2fcb6f3ec.tar.gz rneovim-acbfbbb649c39694c3a6a92160984db2fcb6f3ec.tar.bz2 rneovim-acbfbbb649c39694c3a6a92160984db2fcb6f3ec.zip | |
vim-patch:8.2.3408: can delete a numbered function
Problem: Can delete a numbered function. (Naohiro Ono)
Solution: Disallow deleting a numbered function. (closes vim/vim#8760)
https://github.com/vim/vim/commit/ddfc05100a29263a682dd96bb924dfde4354a654
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/eval/userfunc.c | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_user_func.vim | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 2a7ad792df..147beb78ad 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -2704,6 +2704,13 @@ void ex_delfunction(exarg_T *eap) *p = NUL; } + if (isdigit(*name) && fudi.fd_dict == NULL) { + if (!eap->skip) { + semsg(_(e_invarg2), eap->arg); + } + xfree(name); + return; + } if (!eap->skip) { fp = find_func(name); } diff --git a/src/nvim/testdir/test_user_func.vim b/src/nvim/testdir/test_user_func.vim index 98c2fdd531..7aa21d7816 100644 --- a/src/nvim/testdir/test_user_func.vim +++ b/src/nvim/testdir/test_user_func.vim @@ -423,6 +423,11 @@ func Test_del_func() func d.fn() return 1 endfunc + + " cannot delete the dict function by number + let nr = substitute(execute('echo d'), '.*function(''\(\d\+\)'').*', '\1', '') + call assert_fails('delfunction g:' .. nr, 'E475: Invalid argument: g:') + delfunc d.fn call assert_equal({'a' : 10}, d) endfunc |