Issue #22653: Fix an assertion failure in debug mode when doing a reentrant dict insertion in debug mode.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 1ccea6e..bab6242 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -814,13 +814,14 @@
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 @@
}
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;
}