From 0dc5e45b17476fdd61d87d138986c842a7cd5d8f Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 15 Nov 2026 15:43:13 +0300 Subject: [PATCH 1/3] [3.14] gh-152254: Fix a crash in `PyObject_ClearManagedDict` under memory pressure (GH-152255) (cherry picked from commit 369d8bc4f6fe1f751de2512523a1acb95491a5eb) Co-authored-by: sobolevn Co-authored-by: Victor Stinner --- Lib/test/test_capi/test_object.py | 77 +++++++++++++++++++ ...-06-26-11-34-50.gh-issue-152254.yK6TGp.rst | 2 + Modules/_testcapi/object.c | 8 ++ Objects/dictobject.c | 1 + 4 files changed, 88 insertions(+) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-11-34-50.gh-issue-152254.yK6TGp.rst diff --git a/Lib/test/test_capi/test_object.py b/Lib/test/test_capi/test_object.py index fa2bf4fcb521e0..42f833f52325c9 100644 --- a/Lib/test/test_capi/test_object.py +++ b/Lib/test/test_capi/test_object.py @@ -273,6 +273,83 @@ def func(x): for i in [0, 1, 2]: self.assertFalse(_testcapi.pyobject_is_unique_temporary_new_object()) + def test_object_clear_managed_dict(self): + # PyObject_ClearManagedDict + clear_managed_dict = _testcapi.pyobject_clear_managed_dict + ManagedDictType = _testcapi.ManagedDictType + + obj = ManagedDictType() + obj.value = 'first' + # asserting `__dict__` is a must to materialize the value before clean: + self.assertEqual(obj.__dict__, {'value': 'first'}) + self.assertIs(type(obj.__dict__), dict) + clear_managed_dict(obj) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + # big object: + obj = ManagedDictType() + existing_dict = {f'attr_{x}': x for x in range(100)} + obj.__dict__ = existing_dict + self.assertIs(obj.__dict__, existing_dict) + clear_managed_dict(obj) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + # empty dict: + obj = ManagedDictType() + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + clear_managed_dict(obj) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + # double clear: + obj = ManagedDictType() + obj.value = 'first' + self.assertEqual(obj.__dict__, {'value': 'first'}) + clear_managed_dict(obj) + clear_managed_dict(obj) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + # unmaterialized: + obj = ManagedDictType() + obj.value = 'first' + clear_managed_dict(obj) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + # CRASHES: clear_managed_dict(NULL) + + @threading_helper.requires_working_threading() + @support.nomemtest + def test_object_clear_managed_dict_ft_memory_error(self): + # gh-152254: Test PyObject_ClearManagedDict() error. + # The setup must contain: object owned by another thread + # and the attempt to clear the managed dict with no memory left. + clear_managed_dict = _testcapi.pyobject_clear_managed_dict + ManagedDictType = _testcapi.ManagedDictType + + obj = ManagedDictType() + obj.value = 'first' + self.assertEqual(len(obj.__dict__), 1) + + def worker(): + # This needs to be in a separate thread for the crash to happen: + with support.catch_unraisable_exception() as ex: + # `PyObject_ClearManagedDict()` used to crash: + _testcapi.call_with_nomemory(0, 1, clear_managed_dict, obj) + self.assertIsNotNone(ex.unraisable) + self.assertIs(ex.unraisable.exc_type, MemoryError) + self.assertIn('managed dict', ex.unraisable.err_msg) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + + threading_helper.run_concurrently([worker]) + self.assertEqual(obj.__dict__, {}) + self.assertIs(type(obj.__dict__), dict) + class RefTracerTest(unittest.TestCase): @support.requires_resource('cpu') diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-11-34-50.gh-issue-152254.yK6TGp.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-11-34-50.gh-issue-152254.yK6TGp.rst new file mode 100644 index 00000000000000..206b88a2affb2b --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-11-34-50.gh-issue-152254.yK6TGp.rst @@ -0,0 +1,2 @@ +Fix a crash during the clean up of managed dict objects under a memory +pressure in :c:func:`PyObject_ClearManagedDict`. diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c index 88b8962ab153a3..1f87d4b97696f1 100644 --- a/Modules/_testcapi/object.c +++ b/Modules/_testcapi/object.c @@ -153,6 +153,13 @@ pyobject_is_unique_temporary_new_object(PyObject *self, PyObject *unused) return PyLong_FromLong(result); } +static PyObject * +pyobject_clear_managed_dict(PyObject *self, PyObject *obj) +{ + PyObject_ClearManagedDict(obj); + Py_RETURN_NONE; +} + static int MyObject_dealloc_called = 0; static void @@ -509,6 +516,7 @@ static PyMethodDef test_methods[] = { {"pyobject_enable_deferred_refcount", pyobject_enable_deferred_refcount, METH_O}, {"pyobject_is_unique_temporary", pyobject_is_unique_temporary, METH_O}, {"pyobject_is_unique_temporary_new_object", pyobject_is_unique_temporary_new_object, METH_NOARGS}, + {"pyobject_clear_managed_dict", pyobject_clear_managed_dict, METH_O}, {"test_py_try_inc_ref", test_py_try_inc_ref, METH_NOARGS}, {"test_xincref_doesnt_leak",test_xincref_doesnt_leak, METH_NOARGS}, {"test_incref_doesnt_leak", test_incref_doesnt_leak, METH_NOARGS}, diff --git a/Objects/dictobject.c b/Objects/dictobject.c index e857596c0837b1..45d0a4e3d24517 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -7530,6 +7530,7 @@ PyObject_ClearManagedDict(PyObject *obj) Py_BEGIN_CRITICAL_SECTION(dict); PyInterpreterState *interp = _PyInterpreterState_GET(); PyDictKeysObject *oldkeys = dict->ma_keys; + ensure_shared_on_resize(dict); set_keys(dict, Py_EMPTY_KEYS); dict->ma_values = NULL; dictkeys_decref(interp, oldkeys, IS_DICT_SHARED(dict)); From abd5f03f87b1f07f036c08a7266da08c9583e7ba Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 15 Nov 2026 19:14:56 +0300 Subject: [PATCH 2/3] Remove the test --- Lib/test/test_capi/test_object.py | 78 ------------------------------- Modules/_testcapi/object.c | 8 ---- 2 files changed, 86 deletions(-) diff --git a/Lib/test/test_capi/test_object.py b/Lib/test/test_capi/test_object.py index 42f833f52325c9..e7fbee63a72d12 100644 --- a/Lib/test/test_capi/test_object.py +++ b/Lib/test/test_capi/test_object.py @@ -273,84 +273,6 @@ def func(x): for i in [0, 1, 2]: self.assertFalse(_testcapi.pyobject_is_unique_temporary_new_object()) - def test_object_clear_managed_dict(self): - # PyObject_ClearManagedDict - clear_managed_dict = _testcapi.pyobject_clear_managed_dict - ManagedDictType = _testcapi.ManagedDictType - - obj = ManagedDictType() - obj.value = 'first' - # asserting `__dict__` is a must to materialize the value before clean: - self.assertEqual(obj.__dict__, {'value': 'first'}) - self.assertIs(type(obj.__dict__), dict) - clear_managed_dict(obj) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - # big object: - obj = ManagedDictType() - existing_dict = {f'attr_{x}': x for x in range(100)} - obj.__dict__ = existing_dict - self.assertIs(obj.__dict__, existing_dict) - clear_managed_dict(obj) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - # empty dict: - obj = ManagedDictType() - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - clear_managed_dict(obj) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - # double clear: - obj = ManagedDictType() - obj.value = 'first' - self.assertEqual(obj.__dict__, {'value': 'first'}) - clear_managed_dict(obj) - clear_managed_dict(obj) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - # unmaterialized: - obj = ManagedDictType() - obj.value = 'first' - clear_managed_dict(obj) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - # CRASHES: clear_managed_dict(NULL) - - @threading_helper.requires_working_threading() - @support.nomemtest - def test_object_clear_managed_dict_ft_memory_error(self): - # gh-152254: Test PyObject_ClearManagedDict() error. - # The setup must contain: object owned by another thread - # and the attempt to clear the managed dict with no memory left. - clear_managed_dict = _testcapi.pyobject_clear_managed_dict - ManagedDictType = _testcapi.ManagedDictType - - obj = ManagedDictType() - obj.value = 'first' - self.assertEqual(len(obj.__dict__), 1) - - def worker(): - # This needs to be in a separate thread for the crash to happen: - with support.catch_unraisable_exception() as ex: - # `PyObject_ClearManagedDict()` used to crash: - _testcapi.call_with_nomemory(0, 1, clear_managed_dict, obj) - self.assertIsNotNone(ex.unraisable) - self.assertIs(ex.unraisable.exc_type, MemoryError) - self.assertIn('managed dict', ex.unraisable.err_msg) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - threading_helper.run_concurrently([worker]) - self.assertEqual(obj.__dict__, {}) - self.assertIs(type(obj.__dict__), dict) - - class RefTracerTest(unittest.TestCase): @support.requires_resource('cpu') @support.skip_emscripten_stack_overflow() diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c index 1f87d4b97696f1..88b8962ab153a3 100644 --- a/Modules/_testcapi/object.c +++ b/Modules/_testcapi/object.c @@ -153,13 +153,6 @@ pyobject_is_unique_temporary_new_object(PyObject *self, PyObject *unused) return PyLong_FromLong(result); } -static PyObject * -pyobject_clear_managed_dict(PyObject *self, PyObject *obj) -{ - PyObject_ClearManagedDict(obj); - Py_RETURN_NONE; -} - static int MyObject_dealloc_called = 0; static void @@ -516,7 +509,6 @@ static PyMethodDef test_methods[] = { {"pyobject_enable_deferred_refcount", pyobject_enable_deferred_refcount, METH_O}, {"pyobject_is_unique_temporary", pyobject_is_unique_temporary, METH_O}, {"pyobject_is_unique_temporary_new_object", pyobject_is_unique_temporary_new_object, METH_NOARGS}, - {"pyobject_clear_managed_dict", pyobject_clear_managed_dict, METH_O}, {"test_py_try_inc_ref", test_py_try_inc_ref, METH_NOARGS}, {"test_xincref_doesnt_leak",test_xincref_doesnt_leak, METH_NOARGS}, {"test_incref_doesnt_leak", test_incref_doesnt_leak, METH_NOARGS}, From 2a5b61d362a1d2e2c36e45519ece82a4181efe96 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 15 Nov 2026 19:16:01 +0300 Subject: [PATCH 3/3] Remove the test --- Lib/test/test_capi/test_object.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_capi/test_object.py b/Lib/test/test_capi/test_object.py index e7fbee63a72d12..fa2bf4fcb521e0 100644 --- a/Lib/test/test_capi/test_object.py +++ b/Lib/test/test_capi/test_object.py @@ -273,6 +273,7 @@ def func(x): for i in [0, 1, 2]: self.assertFalse(_testcapi.pyobject_is_unique_temporary_new_object()) + class RefTracerTest(unittest.TestCase): @support.requires_resource('cpu') @support.skip_emscripten_stack_overflow()