mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-02 23:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1564

Browse Source 
Problem:    An empty list in function() causes an error.
Solution:   Handle an empty list like there is no list of arguments.

346418c624
This commit is contained in:
Michael Ennen
2016-10-25 23:03:04 -07:00
committed by James McCoy
parent 66922d89cc
commit f90551b0e6
3 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/nvim/eval.c
View File

@@ -9428,12 +9428,16 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
char_u *name;
s = get_tv_string(&argvars[0]);
if (s == NULL || *s == NUL || ascii_isdigit(*s))
if (s == NULL || *s == NUL || ascii_isdigit(*s)) {
EMSG2(_(e_invarg2), s);
/* Don't check an autoload name for existence here. */
else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
} else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s)) {
// Don't check an autoload name for existence here.
EMSG2(_("E700: Unknown function: %s"), s);
else {
} else {
int dict_idx = 0;
int arg_idx = 0;
list_T *list = NULL;
if (STRNCMP(s, "s:", 2) == 0 || STRNCMP(s, "<SID>", 5) == 0) {
char sid_buf[25];
int off = *s == 's' ? 2 : 5;
@@ -9454,10 +9458,6 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
if (argvars[1].v_type != VAR_UNKNOWN) {
partial_T *pt;
int dict_idx = 0;
int arg_idx = 0;
if (argvars[2].v_type != VAR_UNKNOWN) {
// function(name, [args], dict)
arg_idx = 1;
@@ -9469,23 +9469,34 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// function(name, [args])
arg_idx = 1;
}
if (dict_idx > 0 && (argvars[dict_idx].v_type != VAR_DICT
|| argvars[dict_idx].vval.v_dict == NULL)) {
EMSG(_("E922: expected a dict"));
xfree(name);
return;
if (dict_idx > 0) {
if (argvars[dict_idx].v_type != VAR_DICT) {
EMSG(_("E922: expected a dict"));
xfree(name);
return;
}
if (argvars[dict_idx].vval.v_dict == NULL) {
dict_idx = 0;
}
}
if (arg_idx > 0 && (argvars[arg_idx].v_type != VAR_LIST
|| argvars[arg_idx].vval.v_list == NULL)) {
EMSG(_("E923: Second argument of function() must be a list or a dict"));
xfree(name);
return;
if (arg_idx > 0) {
if (argvars[arg_idx].v_type != VAR_LIST) {
EMSG(_("E923: Second argument of function() must be"
"a list or a dict"));
xfree(name);
return;
}
list = argvars[arg_idx].vval.v_list;
if (list == NULL || list->lv_len == 0) {
arg_idx = 0;
}
}
}
if (dict_idx > 0 || arg_idx > 0) {
partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
pt = (partial_T *)xcalloc(1, sizeof(partial_T));
if (pt != NULL) {
if (arg_idx > 0) {
list_T *list = argvars[arg_idx].vval.v_list;
listitem_T *li;
int i = 0;