From 39b56283b8a9fca1d77103bc4557d338312d7327 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 24 Jun 2025 19:33:25 +0300 Subject: [PATCH] gh-135878: Fix crash in `types.SimpleNamespace.__repr__` (GH-135889) (cherry picked from commit b3ab94acd308591bbdf264f1722fedc7ee25d6fa) Co-authored-by: sobolevn Co-authored-by: Peter Bierma --- .../Library/2025-06-24-14-43-24.gh-issue-135878.Db4roX.rst | 3 +++ Objects/namespaceobject.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2025-06-24-14-43-24.gh-issue-135878.Db4roX.rst diff --git a/Misc/NEWS.d/next/Library/2025-06-24-14-43-24.gh-issue-135878.Db4roX.rst b/Misc/NEWS.d/next/Library/2025-06-24-14-43-24.gh-issue-135878.Db4roX.rst new file mode 100644 index 00000000000000..969cf2dfa40878 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-06-24-14-43-24.gh-issue-135878.Db4roX.rst @@ -0,0 +1,3 @@ +Fixes a crash of :class:`types.SimpleNamespace` on :term:`free threading` builds, +when several threads were calling its :meth:`~object.__repr__` method at the +same time. diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c index 4ef3bd92f5a569..7eeac11b553810 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -120,9 +120,10 @@ namespace_repr(PyObject *ns) if (PyUnicode_Check(key) && PyUnicode_GET_LENGTH(key) > 0) { PyObject *value, *item; - value = PyDict_GetItemWithError(d, key); - if (value != NULL) { + int has_key = PyDict_GetItemRef(d, key, &value); + if (has_key == 1) { item = PyUnicode_FromFormat("%U=%R", key, value); + Py_DECREF(value); if (item == NULL) { loop_error = 1; } @@ -131,7 +132,7 @@ namespace_repr(PyObject *ns) Py_DECREF(item); } } - else if (PyErr_Occurred()) { + else if (has_key < 0) { loop_error = 1; } }