mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-132002: Fix crash of ContextVar on unhashable str subtype (#132003)

Browse source
This commit is contained in:
sobolevn 2025-04-02 14:48:47 +03:00 • committed by GitHub
parent 87d9983994
commit ab2a3dda1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_context.py
View file

@ -92,6 +92,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()

2
Misc/NEWS.d/next/Library/2025-04-02-11-31-15.gh-issue-132002.TMsYvE.rst Normal file
View file

@ -0,0 +1,2 @@
Fix crash when deallocating :class:`contextvars.ContextVar` with weird
unahashable string names.

13
Python/context.c
View file

@ -878,14 +878,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
@ -894,6 +887,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)))
{