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

vim-patch:7.4.1847

Browse Source 
Problem:    Getting an item from a NULL dict crashes.  Setting a register to a
            NULL list crashes. (Nikolai Pavlov, issue vim/vim#768)  Comparing a NULL
            dict with a NULL dict fails.
Solution:   Properly check for NULL.

13ddc5c359
This commit is contained in:
lonerover
2016-12-27 11:59:59 +08:00
committed by James McCoy
parent fd9cc8b0b2
commit 1bea73a21e
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval.c
View File

@@ -5162,8 +5162,12 @@ dict_equal (
dictitem_T *item2;
int todo;
if (d1 == NULL || d2 == NULL)
if (d1 == NULL && d2 == NULL) {
return true;
}
if (d1 == NULL || d2 == NULL) {
return FALSE;
}
if (d1 == d2)
return TRUE;
if (dict_len(d1) != dict_len(d2))
@@ -6669,9 +6673,12 @@ dictitem_T *dict_find(dict_T *d, char_u *key, int len)
char_u *tofree = NULL;
hashitem_T *hi;
if (len < 0)
if (d == NULL) {
return NULL;
}
if (len < 0) {
akey = key;
else if (len >= AKEYLEN) {
} else if (len >= AKEYLEN) {
tofree = akey = vim_strnsave(key, len);
} else {
/* Avoid a malloc/free by using buf[]. */
@@ -15516,7 +15523,10 @@ static void f_setreg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
if (argvars[1].v_type == VAR_LIST) {
int len = argvars[1].vval.v_list->lv_len;
list_T *ll = argvars[1].vval.v_list;
// If the list is NULL handle like an empty list.
int len = ll == NULL ? 0 : ll->lv_len;
// First half: use for pointers to result lines; second half: use for
// pointers to allocated copies.
char_u **lstval = xmalloc(sizeof(char_u *) * ((len + 1) * 2));
@@ -15525,7 +15535,7 @@ static void f_setreg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
char_u **curallocval = allocval;
char_u buf[NUMBUFLEN];
for (listitem_T *li = argvars[1].vval.v_list->lv_first;
for (listitem_T *li = ll == NULL ? NULL : ll->lv_first;
li != NULL;
li = li->li_next) {
char_u *strval = get_tv_string_buf_chk(&li->li_tv, buf);