mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3158: strange error message when using islocked() with a number (#28962)

Browse Source 
Problem:    Strange error message when using islocked() with a number.
            (Yegappan Lakshmanan)
Solution:   Check that the name is empty.

1840a7b4e3

Use ll_name_len instead.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2024-05-24 18:29:17 +08:00
committed by GitHub
parent a616272f56
commit 8db9a0e5a2
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/eval.c
View File

@@ -1737,6 +1737,7 @@ char *get_lval(char *const name, typval_T *const rettv, lval_T *const lp, const
} }
tv_clear(&var1); tv_clear(&var1);
lp->ll_name_len = (size_t)(p - lp->ll_name);
return p; return p;
} }

2
src/nvim/eval/funcs.c
View File

@@ -4119,7 +4119,7 @@ static void f_islocked(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
FNE_CHECK_START); FNE_CHECK_START);
if (end != NULL && lv.ll_name != NULL) { if (end != NULL && lv.ll_name != NULL) {
if (*end != NUL) { if (*end != NUL) {
semsg(_(e_trailing_arg), end); semsg(_(lv.ll_name_len == 0 ? e_invarg2 : e_trailing_arg), end);
} else { } else {
if (lv.ll_tv == NULL) { if (lv.ll_tv == NULL) {
dictitem_T *di = find_var(lv.ll_name, lv.ll_name_len, NULL, true); dictitem_T *di = find_var(lv.ll_name, lv.ll_name_len, NULL, true);

5
test/old/testdir/test_functions.vim
View File

@@ -98,6 +98,11 @@ func Test_err_teapot()
call assert_fails('call err_teapot(expr)', "E503: Coffee is currently not available") call assert_fails('call err_teapot(expr)', "E503: Coffee is currently not available")
endfunc endfunc
func Test_islocked()
call assert_fails('call islocked(99)', 'E475:')
call assert_fails('call islocked("s: x")', 'E488:')
endfunc
func Test_len() func Test_len()
call assert_equal(1, len(0)) call assert_equal(1, len(0))
call assert_equal(2, len(12)) call assert_equal(2, len(12))