diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-11-23 11:34:01 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-11-23 11:34:01 +0000 |
commit | bc222152d8dea252aa5f1fa24b5536ed269feb92 (patch) | |
tree | bab73ad7c0b1a03b1cd761b90711adb8e18f29c5 /src | |
parent | df3c0eb41e1f48596c85af88b42fed22e3cca328 (diff) |
patch 9.0.0926: Coverity warns for not using return value of dict_add()v9.0.0926
Problem: Coverity warns for not using return value of dict_add().
Solution: When dict_add() fails then don't call hash_remove().
Diffstat (limited to 'src')
-rw-r--r-- | src/dict.c | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/dict.c b/src/dict.c index 30264a9134..ffd5d381ec 100644 --- a/src/dict.c +++ b/src/dict.c @@ -1122,10 +1122,11 @@ dict_extend(dict_T *d1, dict_T *d2, char_u *action, char *func_name) { 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. di1 = HI2DI(hi2); - dict_add(d1, di1); - hash_remove(&d2->dv_hashtab, hi2); + if (dict_add(d1, di1) == OK) + hash_remove(&d2->dv_hashtab, hi2); } else { diff --git a/src/version.c b/src/version.c index 6ccc704d48..c9e3a2ef6b 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 926, +/**/ 925, /**/ 924, |