From 0757d860272b3bfd3a6bce71bef122628f9e3852 Mon Sep 17 00:00:00 2001 From: iRELDevz Date: Wed, 11 Nov 2026 01:02:35 +0700 Subject: [PATCH 1/3] gh-161767: Fix crash in PyDict_AsFrozenDictAndClear() with inline values --- Lib/test/test_capi/test_dict.py | 11 +++++ ...-11-10-18-00-09.gh-issue-161767.2EoShw.rst | 2 + Objects/dictobject.c | 40 ++++++++++++++----- 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/C_API/2026-11-10-18-00-09.gh-issue-161767.2EoShw.rst diff --git a/Lib/test/test_capi/test_dict.py b/Lib/test/test_capi/test_dict.py index 9a2e79d4da7e715..2f7b764ede616b9 100644 --- a/Lib/test/test_capi/test_dict.py +++ b/Lib/test/test_capi/test_dict.py @@ -635,6 +635,17 @@ class DictSubtype(dict): ... self.assertIs(type(d), DictSubtype) self.assertEqual(d, DictSubtype({})) + # instance dict that still has inline values + class A: ... + a = A() + a.x = 1 + f = as_frozendict(a.__dict__) + a.x = 2 + self.assertEqual(f, frozendict(x=1)) + self.assertEqual(vars(a), {'x': 2}) + del a + self.assertEqual(f, frozendict(x=1)) + for wrong_input in (frozendict(), [], None): with self.subTest(wrong_input=wrong_input): with self.assertRaises(SystemError): diff --git a/Misc/NEWS.d/next/C_API/2026-11-10-18-00-09.gh-issue-161767.2EoShw.rst b/Misc/NEWS.d/next/C_API/2026-11-10-18-00-09.gh-issue-161767.2EoShw.rst new file mode 100644 index 000000000000000..2cbf227f1d236a4 --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2026-11-10-18-00-09.gh-issue-161767.2EoShw.rst @@ -0,0 +1,2 @@ +Fix a crash in :c:func:`PyDict_AsFrozenDictAndClear` when called on an +instance :attr:`~object.__dict__` that still uses inline values. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index b8ca74aedc2adfa..55576a23a412a68 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -8662,33 +8662,48 @@ frozendict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return d; } -static void +static int transfer_keys_and_values_lock_held(PyObject *res, PyObject *dict) { PyDictObject *new = (PyDictObject *)res; PyDictObject *old = (PyDictObject *)dict; assert(can_modify_dict(old)); - // Fast path: do nothing on an empty dict: if (old->ma_keys == Py_EMPTY_KEYS) { - return; + return 0; } Py_ssize_t used = old->ma_used; PyDictKeysObject *keys = old->ma_keys; PyDictValues *values = old->ma_values; - // Clear the old dict keys and values, but do not decref them: - clear_common(old); - set_keys(old, Py_EMPTY_KEYS); - set_values(old, NULL); - ASSERT_CONSISTENT(old); + if (values && values->embedded) { + // values are inline in the object, copy them and clear the object's copy + PyDictValues *v = values; + values = copy_values(v); + if (!values) { + PyErr_NoMemory(); + return -1; + } + dictkeys_incref(keys); + clear_common(old); + for (Py_ssize_t i = 0; i < keys->dk_nentries; i++) { + FT_ATOMIC_STORE_PTR_RELEASE(v->values[i], NULL); + } + FT_ATOMIC_STORE_UINT8_RELEASE(v->size, 0); + } + else { + clear_common(old); + set_keys(old, Py_EMPTY_KEYS); + set_values(old, NULL); + ASSERT_CONSISTENT(old); + } - // Transfer keys and values from dict to frozendict: new->ma_used = used; new->ma_keys = keys; new->ma_values = values; ASSERT_CONSISTENT(new); + return 0; } PyObject * @@ -8704,9 +8719,14 @@ PyDict_AsFrozenDictAndClear(PyObject *dict) return NULL; } + int err; Py_BEGIN_CRITICAL_SECTION(dict); - transfer_keys_and_values_lock_held(res, dict); + err = transfer_keys_and_values_lock_held(res, dict); Py_END_CRITICAL_SECTION(); + if (err < 0) { + Py_DECREF(res); + return NULL; + } _PyObject_GC_TRACK(res); assert(_PyFrozenDictObject_CAST(res)->ma_hash == -1); From 3fd3f1eae6a5ce0b8ce90ffd7ba25df88274dd59 Mon Sep 17 00:00:00 2001 From: iRELDevz Date: Thu, 12 Nov 2026 14:41:17 +0700 Subject: [PATCH 2/3] Use v->capacity instead of dk_nentries when clearing inline values --- Objects/dictobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 2eb87d38072de6e..04b14d061466551 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -8687,7 +8687,7 @@ transfer_keys_and_values_lock_held(PyObject *res, PyObject *dict) } dictkeys_incref(keys); clear_common(old); - for (Py_ssize_t i = 0; i < keys->dk_nentries; i++) { + for (Py_ssize_t i = 0; i < v->capacity; i++) { FT_ATOMIC_STORE_PTR_RELEASE(v->values[i], NULL); } FT_ATOMIC_STORE_UINT8_RELEASE(v->size, 0); From 0600aa75cdf9427468903aaf95bb6a587b90765b Mon Sep 17 00:00:00 2001 From: iRELDevz Date: Sat, 14 Nov 2026 16:52:36 +0700 Subject: [PATCH 3/3] Check the old dict after clearing it --- Lib/test/test_capi/test_dict.py | 1 + Objects/dictobject.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_capi/test_dict.py b/Lib/test/test_capi/test_dict.py index 2f7b764ede616b9..21caa67fda9521a 100644 --- a/Lib/test/test_capi/test_dict.py +++ b/Lib/test/test_capi/test_dict.py @@ -640,6 +640,7 @@ class A: ... a = A() a.x = 1 f = as_frozendict(a.__dict__) + self.assertEqual(vars(a), {}) a.x = 2 self.assertEqual(f, frozendict(x=1)) self.assertEqual(vars(a), {'x': 2}) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 04b14d061466551..4b3127c321ed632 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -8696,9 +8696,11 @@ transfer_keys_and_values_lock_held(PyObject *res, PyObject *dict) clear_common(old); set_keys(old, Py_EMPTY_KEYS); set_values(old, NULL); - ASSERT_CONSISTENT(old); } + ASSERT_CONSISTENT(old); + // Only transfer keys and values to the new dict + // once the old dict is cleared new->ma_used = used; new->ma_keys = keys; new->ma_values = values;