Commitfdf8ac0

authored and

committed

pythongh-132002: Fix crash ofContextVar on unhashablestr subtype (python#132003)

1 parent8db07f0 commitfdf8ac0Copy full SHA for fdf8ac0

File tree

+17

-7

lines changed

+17

-7

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,15 @@ def test_context_new_1(self):`
`92`	`92`	`contextvars.Context(a=1)`
`93`	`93`	`contextvars.Context(**{})`
`94`	`94`
	`95`	`+deftest_context_new_unhashable_str_subclass(self):`
	`96`	`+# gh-132002: it used to crash on unhashable str subtypes.`
	`97`	`+classweird_str(str):`
	`98`	`+def__eq__(self,other):`
	`99`	`+pass`
	`100`	`+`
	`101`	`+withself.assertRaisesRegex(TypeError,'unhashable type'):`
	`102`	`+contextvars.ContextVar(weird_str())`
	`103`	`+`
`95`	`104`	`deftest_context_typerrors_1(self):`
`96`	`105`	`ctx=contextvars.Context()`
`97`	`106`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix crash when deallocating:class:`contextvars.ContextVar` with weird
	`2`	`+unahashable string names.`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -878,14 +878,7 @@ contextvar_new(PyObject name, PyObject def)`
`878`	`878`	`returnNULL;`
`879`	`879`	`}`
`880`	`880`
`881`		`-var->var_hash=contextvar_generate_hash(var,name);`
`882`		`-if (var->var_hash==-1) {`
`883`		`-Py_DECREF(var);`
`884`		`-returnNULL;`
`885`		`- }`
`886`		`-`
`887`	`881`	`var->var_name=Py_NewRef(name);`
`888`		`-`
`889`	`882`	`var->var_default=Py_XNewRef(def);`
`890`	`883`
`891`	`884`	`#ifndefPy_GIL_DISABLED`
`@@ -894,6 +887,12 @@ contextvar_new(PyObject name, PyObject def)`
`894`	`887`	`var->var_cached_tsver=0;`
`895`	`888`	`#endif`
`896`	`889`
	`890`	`+var->var_hash=contextvar_generate_hash(var,name);`
	`891`	`+if (var->var_hash==-1) {`
	`892`	`+Py_DECREF(var);`
	`893`	`+returnNULL;`
	`894`	`+ }`
	`895`	`+`
`897`	`896`	`if (_PyObject_GC_MAY_BE_TRACKED(name)\|\|`
`898`	`897`	`(def!=NULL&&_PyObject_GC_MAY_BE_TRACKED(def)))`
`899`	`898`	`{`

Comments

(0)