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

vim-patch:7.4.2002

Browse Source 
Problem:    Crash when passing number to filter() or map().
Solution:   Convert to a string. (Ozaki Kiichi)

a06ec8f345
This commit is contained in:
Michael Ennen
2016-12-14 00:26:52 -07:00
parent bb2afeb026
commit 6c423989fc
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/eval.c
View File

@@ -9414,7 +9414,8 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
static int filter_map_one(typval_T *tv, typval_T *expr, int map, int *remp)
{
typval_T rettv;
typeval_T argv[3];
typval_T argv[3];
char_u buf[NUMBUFLEN];
char_u *s;
int retval = FAIL;
int dummy;
@@ -9424,6 +9425,7 @@ static int filter_map_one(typval_T *tv, typval_T *expr, int map, int *remp)
argv[1] = vimvars[VV_VAL].vv_tv;
s = expr->vval.v_string;
if (expr->v_type == VAR_FUNC) {
s = expr->vval.v_string;
if (call_func(s, (int)STRLEN(s), &rettv, 2, argv, 0L, 0L, &dummy,
true, NULL, NULL) == FAIL) {
goto theend;
@@ -9437,6 +9439,10 @@ static int filter_map_one(typval_T *tv, typval_T *expr, int map, int *remp)
goto theend;
}
} else {
s = get_tv_string_buf_chk(expr, buf);
if (s == NULL) {
goto theend;
}
s = skipwhite(s);
if (eval1(&s, &rettv, true) == FAIL) {
goto theend;