# HG changeset patch # User Christian Brabandt # Date 1489527005 -3600 # Node ID a54985a73ab27a63ac419b29bdd4bbc523185794 # Parent b5ac92d0f31f98e57b1a2137e1f1244b3f0118a8 patch 8.0.0458: potential crash if adding list or dict to dict fails commit https://github.com/vim/vim/commit/42f45b850df93b806ef44f3025aecedfffb9ae01 Author: Bram Moolenaar Date: Tue Mar 14 22:17:14 2017 +0100 patch 8.0.0458: potential crash if adding list or dict to dict fails Problem: Potential crash if adding list or dict to dict fails. Solution: Make sure the reference count is correct. (Nikolai Pavlov, closes #1555) diff --git a/src/dict.c b/src/dict.c --- a/src/dict.c +++ b/src/dict.c @@ -356,12 +356,12 @@ dict_add_list(dict_T *d, char *key, list item->di_tv.v_lock = 0; item->di_tv.v_type = VAR_LIST; item->di_tv.vval.v_list = list; + ++list->lv_refcount; if (dict_add(d, item) == FAIL) { dictitem_free(item); return FAIL; } - ++list->lv_refcount; return OK; } @@ -380,12 +380,12 @@ dict_add_dict(dict_T *d, char *key, dict item->di_tv.v_lock = 0; item->di_tv.v_type = VAR_DICT; item->di_tv.vval.v_dict = dict; + ++dict->dv_refcount; if (dict_add(d, item) == FAIL) { dictitem_free(item); return FAIL; } - ++dict->dv_refcount; return OK; } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 458, +/**/ 457, /**/ 456,