From 9ed7d34af303190bb222624157e0c6cd78b7d120 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 9 Nov 2017 22:10:33 +0100 Subject: patch 8.0.1283: test 86 fails under ASAN Problem: Test 86 fails under ASAN. Solution: Fix that an item was added to a dictionary twice. --- src/if_py_both.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/if_py_both.h') diff --git a/src/if_py_both.h b/src/if_py_both.h index 1801967268..3380142d1e 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -1996,6 +1996,7 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) PyObject *todecref; char_u *key; dictitem_T *di; + hashitem_T *hi; if (!(fast = PySequence_Fast(item, ""))) { @@ -2052,7 +2053,8 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) Py_DECREF(fast); - if (dict_add(dict, di) == FAIL) + hi = hash_find(&dict->dv_hashtab, di->di_key); + if (!HASHITEM_EMPTY(hi) || dict_add(dict, di) == FAIL) { RAISE_KEY_ADD_FAIL(di->di_key); Py_DECREF(iterator); -- cgit v1.2.3