[3.13] gh-132002: Fix crash of `ContextVar` on unhashable `str` subtype (GH-132003...

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 255be306156c0bf6b6091973e11c8e8c5ff8462b..4e6b3b7fc608ebc168029111763082a990df42ba 100644 (file)
--- 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 (file)
index 0000000..b46bc25
--- /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 c5052935b34dab8269616b27358851e7e7735849..c9675f44772cb46e50f8a88483ee8715b2b65441 100644 (file)
--- a/Python/context.c
+++ b/Python/context.c
@@ -823,14 +823,7 @@ 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);
 
 #ifndef Py_GIL_DISABLED
@@ -839,6 +832,12 @@ contextvar_new(PyObject *name, PyObject *def)
     var->var_cached_tsver = 0;
 #endif
 
+    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)))
     {