thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3380: crash when using NULL string for funcref()

Browse Source 
Problem:    Crash when using NULL string for funcref().
Solution:   Check for NULL argument. (issue #8260)
This commit is contained in:
Bram Moolenaar
2021-08-28 12:49:27 +02:00
parent 271906bc06
commit 60b6e6f6cc
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/evalfunc.c
View File

@@ -3932,6 +3932,11 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
s = tv_get_string(&argvars[0]); s = tv_get_string(&argvars[0]);
use_string = TRUE; use_string = TRUE;
} }
if (s == NULL)
{
semsg(_(e_invarg2), "NULL");
return;
}
if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref) if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref)
{ {

1
src/testdir/test_expr.vim
View File

@@ -501,6 +501,7 @@ func Test_funcref()
let OneByRef = funcref("One", repeat(["foo"], 20)) let OneByRef = funcref("One", repeat(["foo"], 20))
call assert_fails('let OneByRef = funcref("One", repeat(["foo"], 21))', 'E118:') call assert_fails('let OneByRef = funcref("One", repeat(["foo"], 21))', 'E118:')
call assert_fails('echo function("min") =~ function("min")', 'E694:') call assert_fails('echo function("min") =~ function("min")', 'E694:')
call assert_fails('echo test_null_function()->funcref()', 'E475: Invalid argument: NULL')
endfunc endfunc
func Test_setmatches() func Test_setmatches()

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3380,
/**/ /**/
3379, 3379,
/**/ /**/