mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
gh-132002: Fix crash of ContextVar
on unhashable str
subtype (#132003)
This commit is contained in:
parent
87d9983994
commit
ab2a3dda1d
3 changed files with 17 additions and 7 deletions
|
@ -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)))
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue