]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.14] gh-145446: Add critical section in functools module for `PyDict_Next` (GH...
authorbkap123 <97006829+bkap123@users.noreply.github.com>
Fri, 13 Mar 2026 12:21:04 +0000 (08:21 -0400)
committerGitHub <noreply@github.com>
Fri, 13 Mar 2026 12:21:04 +0000 (13:21 +0100)
(cherry picked from commit 17eb0354ff3110b27f811343c2d4b3c85f2685d5)

Misc/NEWS.d/next/Library/2026-03-03-23-21-40.gh-issue-145446.0c-TJX.rst [new file with mode: 0644]
Modules/_functoolsmodule.c

diff --git a/Misc/NEWS.d/next/Library/2026-03-03-23-21-40.gh-issue-145446.0c-TJX.rst b/Misc/NEWS.d/next/Library/2026-03-03-23-21-40.gh-issue-145446.0c-TJX.rst
new file mode 100644 (file)
index 0000000..96eb0d9
--- /dev/null
@@ -0,0 +1 @@
+Now :mod:`functools` is safer in free-threaded build when using keywords in :func:`functools.partial`
index d779376b191a5e9dbdf156bd1ab8dabb99f9da25..00c5b33acf2c02c45178d1a0720c601c27509d83 100644 (file)
@@ -646,6 +646,8 @@ partial_repr(PyObject *self)
         }
     }
     /* Pack keyword arguments */
+    int error = 0;
+    Py_BEGIN_CRITICAL_SECTION(kw);
     for (i = 0; PyDict_Next(kw, &i, &key, &value);) {
         /* Prevent key.__str__ from deleting the value. */
         Py_INCREF(value);
@@ -653,9 +655,14 @@ partial_repr(PyObject *self)
                                                 key, value));
         Py_DECREF(value);
         if (arglist == NULL) {
-            goto done;
+            error = 1;
+            break;
         }
     }
+    Py_END_CRITICAL_SECTION();
+    if (error) {
+        goto done;
+    }
 
     mod = PyType_GetModuleName(Py_TYPE(pto));
     if (mod == NULL) {