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

patch 7.4.2233

Browse Source 
Problem:    Crash when using funcref() with invalid name. (Dominique Pelle)
Solution:   Check for NULL translated name.
This commit is contained in:
Bram Moolenaar
2016-08-21 14:36:15 +02:00
parent e07e797db0
commit 843b884461
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/evalfunc.c
View File

@@ -3587,8 +3587,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
use_string = TRUE; use_string = TRUE;
} }
if (((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref)
|| is_funcref))
{ {
name = s; name = s;
trans_name = trans_function_name(&name, FALSE, trans_name = trans_function_name(&name, FALSE,
@@ -3597,7 +3596,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
s = NULL; s = NULL;
} }
if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s))) if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s))
|| (is_funcref && trans_name == NULL))
EMSG2(_(e_invarg2), s); EMSG2(_(e_invarg2), s);
/* Don't check an autoload name for existence here. */ /* Don't check an autoload name for existence here. */
else if (trans_name != NULL && (is_funcref else if (trans_name != NULL && (is_funcref

1
src/testdir/test_expr.vim
View File

@@ -237,6 +237,7 @@ func Test_funcref()
call assert_equal(1, OneByRef()) call assert_equal(1, OneByRef())
let OneByRef = funcref('One') let OneByRef = funcref('One')
call assert_equal(2, OneByRef()) call assert_equal(2, OneByRef())
call assert_fails('echo funcref("{")', 'E475:')
endfunc endfunc
func Test_setmatches() func Test_setmatches()

2
src/version.c
View File

@@ -763,6 +763,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 */
/**/
2233,
/**/ /**/
2232, 2232,
/**/ /**/