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

No OOM in dictitem_copy

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho
2014-05-28 19:41:01 -03:00
parent 48fc1602be
commit 2d092cc229
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@@ -5692,7 +5692,7 @@ dictitem_T *dictitem_alloc(char_u *key) FUNC_ATTR_NONNULL_RET
/* /*
* Make a copy of a Dictionary item. * Make a copy of a Dictionary item.
*/ */
static dictitem_T *dictitem_copy(dictitem_T *org) static dictitem_T *dictitem_copy(dictitem_T *org) FUNC_ATTR_NONNULL_RET
{ {
dictitem_T *di = xmalloc(sizeof(dictitem_T) + STRLEN(org->di_key)); dictitem_T *di = xmalloc(sizeof(dictitem_T) + STRLEN(org->di_key));
@@ -8186,7 +8186,7 @@ void dict_extend(dict_T *d1, dict_T *d2, char_u *action)
} }
if (di1 == NULL) { if (di1 == NULL) {
di1 = dictitem_copy(HI2DI(hi2)); di1 = dictitem_copy(HI2DI(hi2));
if (di1 != NULL && dict_add(d1, di1) == FAIL) if (dict_add(d1, di1) == FAIL)
dictitem_free(di1); dictitem_free(di1);
} else if (*action == 'e') { } else if (*action == 'e') {
EMSG2(_("E737: Key already exists: %s"), hi2->hi_key); EMSG2(_("E737: Key already exists: %s"), hi2->hi_key);