From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 2 Apr 2025 12:05:30 +0000 (+0200)
Subject: [3.12] gh-132002: Fix crash of `ContextVar` on unhashable `str` subtype (GH-132003... 
X-Git-Tag: v3.12.10~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3cf1f27e94d65eba4ed300bdf5851c0326a2a44;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-132002: Fix crash of `ContextVar` on unhashable `str` subtype (GH-132003) (#132008)

gh-132002: Fix crash of `ContextVar` on unhashable `str` subtype (GH-132003)
(cherry picked from commit ab2a3dda1d3b6668162a847bf5b6aca2855a3416)

Co-authored-by: sobolevn <mail@sobolevn.me>
---

diff --git a/Lib/test/test_context.py b/Lib/test/test_context.py
index dc6856509a40..e8e5b76ced90 100644
--- a/Lib/test/test_context.py
+++ b/Lib/test/test_context.py
@@ -83,6 +83,15 @@ class ContextTest(unittest.TestCase):
             contextvars.Context(a=1)
         contextvars.Context(**{})
 
+    def test_context_new_unhashable_str_subclass(self):
+        # gh-132002: it used to crash on unhashable str subtypes.
+        class weird_str(str):
+            def __eq__(self, other):
+                pass
+
+        with self.assertRaisesRegex(TypeError, 'unhashable type'):
+            contextvars.ContextVar(weird_str())
+
     def test_context_typerrors_1(self):
         ctx = contextvars.Context()
 
diff --git a/Misc/NEWS.d/next/Library/2025-04-02-11-31-15.gh-issue-132002.TMsYvE.rst b/Misc/NEWS.d/next/Library/2025-04-02-11-31-15.gh-issue-132002.TMsYvE.rst
new file mode 100644
index 000000000000..b46bc25b87f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-02-11-31-15.gh-issue-132002.TMsYvE.rst
@@ -0,0 +1,2 @@
+Fix crash when deallocating :class:`contextvars.ContextVar` with weird
+unahashable string names.
diff --git a/Python/context.c b/Python/context.c
index 7bccfad11a45..e5899219daac 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -821,20 +821,19 @@ contextvar_new(PyObject *name, PyObject *def)
         return NULL;
     }
 
-    var->var_hash = contextvar_generate_hash(var, name);
-    if (var->var_hash == -1) {
-        Py_DECREF(var);
-        return NULL;
-    }
-
     var->var_name = Py_NewRef(name);
-
     var->var_default = Py_XNewRef(def);
 
     var->var_cached = NULL;
     var->var_cached_tsid = 0;
     var->var_cached_tsver = 0;
 
+    var->var_hash = contextvar_generate_hash(var, name);
+    if (var->var_hash == -1) {
+        Py_DECREF(var);
+        return NULL;
+    }
+
     if (_PyObject_GC_MAY_BE_TRACKED(name) ||
             (def != NULL && _PyObject_GC_MAY_BE_TRACKED(def)))
     {