From 2d092cc2291224418dbb6d56bdf1f9f31362d511 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Wed, 28 May 2014 19:41:01 -0300 Subject: No OOM in dictitem_copy --- src/nvim/eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 3c79600f23..a97bbc4871 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -5692,7 +5692,7 @@ dictitem_T *dictitem_alloc(char_u *key) FUNC_ATTR_NONNULL_RET /* * 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)); @@ -8186,7 +8186,7 @@ void dict_extend(dict_T *d1, dict_T *d2, char_u *action) } if (di1 == NULL) { di1 = dictitem_copy(HI2DI(hi2)); - if (di1 != NULL && dict_add(d1, di1) == FAIL) + if (dict_add(d1, di1) == FAIL) dictitem_free(di1); } else if (*action == 'e') { EMSG2(_("E737: Key already exists: %s"), hi2->hi_key); -- cgit