[3.13] gh-130547: Fix race between dict_dealloc and split_keys_entry_added (gh-130778) (gh-130833)

miss-islington · corona10 · web-flow · commit ffef9b0440e4 · 2025-03-05T10:41:29.000+09:00
gh-130547: Fix race between dict_dealloc and split_keys_entry_added (gh-130778) (cherry picked from commit 80e6d3e) Co-authored-by: Donghee Na <donghee.na@python.org>
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -3167,7 +3167,7 @@ dict_dealloc(PyObject *self)
     Py_TRASHCAN_BEGIN(mp, dict_dealloc)
     if (values != NULL) {
         if (values->embedded == 0) {
-            for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) {
+            for (i = 0, n = values->capacity; i < n; i++) {
                 Py_XDECREF(values->values[i]);
             }
             free_values(values, false);

Original file line number	Diff line number	Diff line change
`@@ -3167,7 +3167,7 @@ dict_dealloc(PyObject *self)`
`3167`	`3167`	`Py_TRASHCAN_BEGIN(mp, dict_dealloc)`
`3168`	`3168`	`if (values != NULL) {`
`3169`	`3169`	`if (values->embedded == 0) {`
`3170`		`- for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) {`
	`3170`	`+ for (i = 0, n = values->capacity; i < n; i++) {`
`3171`	`3171`	`Py_XDECREF(values->values[i]);`
`3172`	`3172`	`}`
`3173`	`3173`	`free_values(values, false);`