diff --git a/Lib/test/test_context.py b/Lib/test/test_context.py index dc6856509a40a0..e8e5b76ced90ea 100644 --- a/Lib/test/test_context.py +++ b/Lib/test/test_context.py @@ -83,6 +83,15 @@ def test_context_new_1(self): 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 00000000000000..b46bc25b87f1e3 --- /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 7bccfad11a45b1..e5899219daac8c 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))) {