mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 19:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0926: Coverity warns for not using return value of dict_add()

Browse Source 
Problem:    Coverity warns for not using return value of dict_add().
Solution:   When dict_add() fails then don't call hash_remove().

bc222152d8

N/A patches for version.c:

vim-patch:9.0.0927: Coverity warns for using a NULL pointer

Problem:    Coverity warns for using a NULL pointer.
Solution:   Check for memory allocaion failure.

96cbbe29de

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2022-11-23 19:56:50 +08:00
parent e339376cca
commit 65d95fa415
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval/typval.c
View File

@@ -2471,11 +2471,13 @@ void tv_dict_extend(dict_T *const d1, dict_T *const d2, const char *const action
} }
if (di1 == NULL) { if (di1 == NULL) {
if (*action == 'm') { if (*action == 'm') {
// cheap way to move a dict item from "d2" to "d1" // Cheap way to move a dict item from "d2" to "d1".
// If dict_add() fails then "d2" won't be empty.
dictitem_T *const new_di = di2; dictitem_T *const new_di = di2;
tv_dict_add(d1, new_di); if (tv_dict_add(d1, new_di) == OK) {
hash_remove(&d2->dv_hashtab, hi2); hash_remove(&d2->dv_hashtab, hi2);
tv_dict_watcher_notify(d1, (const char *)new_di->di_key, &new_di->di_tv, NULL); tv_dict_watcher_notify(d1, (const char *)new_di->di_key, &new_di->di_tv, NULL);
}
} else { } else {
dictitem_T *const new_di = tv_dict_item_copy(di2); dictitem_T *const new_di = tv_dict_item_copy(di2);
if (tv_dict_add(d1, new_di) == FAIL) { if (tv_dict_add(d1, new_di) == FAIL) {