mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #22653: Fix an assertion failure in debug mode when doing a reentrant dict insertion in debug mode.

Browse source
This commit is contained in:
Antoine Pitrou 2014-10-18 00:35:00 +02:00
parent baa6d3a01f
commit d696732025
3 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/dictobject.c
View file

@ -814,13 +814,14 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
if (ep == NULL) {
return -1;
}
assert(PyUnicode_CheckExact(key) || mp->ma_keys->dk_lookup == lookdict);
Py_INCREF(value);
MAINTAIN_TRACKING(mp, key, value);
old_value = *value_addr;
if (old_value != NULL) {
assert(ep->me_key != NULL && ep->me_key != dummy);
*value_addr = value;
Py_DECREF(old_value); /* which **CAN** re-enter */
Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
}
else {
if (ep->me_key == NULL) {
@ -851,9 +852,8 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
}
mp->ma_used++;
*value_addr = value;
assert(ep->me_key != NULL && ep->me_key != dummy);
}
assert(ep->me_key != NULL && ep->me_key != dummy);
assert(PyUnicode_CheckExact(key) || mp->ma_keys->dk_lookup == lookdict);
return 0;
}