kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2848: crash whn calling partial

Browse Source 
Problem:    Crash whn calling partial.
Solution:   Check for NULL pointer. (Dominique Pellé, closes vim/vim#8202)

fe8ebdbe5c

Co-authored-by: Dominique Pelle <dominique.pelle@gmail.com>
This commit is contained in:
zeertzjq 2023-04-16 08:55:42 +08:00
parent d13222649a
commit 08121ef69f
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval.c
View File

@ -4175,11 +4175,13 @@ int eval_interp_string(char **arg, typval_T *rettv, bool evaluate)
char *partial_name(partial_T *pt) char *partial_name(partial_T *pt)
FUNC_ATTR_PURE FUNC_ATTR_PURE
{ {
if (pt->pt_name != NULL) { if (pt != NULL) {
return pt->pt_name; if (pt->pt_name != NULL) {
} return pt->pt_name;
if (pt->pt_func != NULL) { }
return pt->pt_func->uf_name; if (pt->pt_func != NULL) {
return pt->pt_func->uf_name;
}
} }
return ""; return "";
} }

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

@ -565,8 +565,8 @@ static void f_call(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
func = (char *)tv_get_string(&argvars[0]); func = (char *)tv_get_string(&argvars[0]);
} }
if (*func == NUL) { if (func == NULL || *func == NUL) {
return; // type error or empty name return; // type error, empty name or null function
} }
dict_T *selfdict = NULL; dict_T *selfdict = NULL;
@ -1136,7 +1136,7 @@ static void f_ctxsize(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} }
/// Set the cursor position. /// Set the cursor position.
/// If 'charcol' is true, then use the column number as a character offset. /// If "charcol" is true, then use the column number as a character offset.
/// Otherwise use the column number as a byte offset. /// Otherwise use the column number as a byte offset.
static void set_cursorpos(typval_T *argvars, typval_T *rettv, bool charcol) static void set_cursorpos(typval_T *argvars, typval_T *rettv, bool charcol)
{ {

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

@ -2009,6 +2009,12 @@ func Test_call()
eval mydict.len->call([], mydict)->assert_equal(4) eval mydict.len->call([], mydict)->assert_equal(4)
call assert_fails("call call('Mylen', [], 0)", 'E715:') call assert_fails("call call('Mylen', [], 0)", 'E715:')
call assert_fails('call foo', 'E107:') call assert_fails('call foo', 'E107:')
" This once caused a crash.
" Nvim doesn't have null functions
" call call(test_null_function(), [])
" Nvim doesn't have null partials
" call call(test_null_partial(), [])
endfunc endfunc
func Test_char2nr() func Test_char2nr()

2
test/old/testdir/test_listdict.vim
View File

@ -751,6 +751,8 @@ func Test_reduce()
" should not crash " should not crash
" Nvim doesn't have null functions " Nvim doesn't have null functions
" call assert_fails('echo reduce([1], test_null_function())', 'E1132:') " call assert_fails('echo reduce([1], test_null_function())', 'E1132:')
" Nvim doesn't have null partials
" call assert_fails('echo reduce([1], test_null_partial())', 'E1132:')
endfunc endfunc
" splitting a string to a List using split() " splitting a string to a List using split()