Commitfbfbfdf

authored

[3.14]gh-138479: Ensure that__typing_subst__ returns a tuple (GH-138482) (#138784)

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent440b83f commitfbfbfdfCopy full SHA for fbfbfdf

File tree

+31

-0

lines changed

+31

-0

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5797,6 +5797,23 @@ class A:`
`5797`	`5797`	`withself.assertRaises(TypeError):`
`5798`	`5798`	`a[int]`
`5799`	`5799`
	`5800`	`+deftest_return_non_tuple_while_unpacking(self):`
	`5801`	`+# GH-138497: GenericAlias objects didn't ensure that __typing_subst__ actually`
	`5802`	`+# returned a tuple`
	`5803`	`+classEvilTypeVar:`
	`5804`	`+__typing_is_unpacked_typevartuple__=True`
	`5805`	`+def__typing_prepare_subst__(*_):`
	`5806`	`+returnNone# any value`
	`5807`	`+def__typing_subst__(*_):`
	`5808`	`+return42# not tuple`
	`5809`	`+`
	`5810`	`+evil=EvilTypeVar()`
	`5811`	`+# Create a dummy TypeAlias that will be given the evil generic from`
	`5812`	`+# above.`
	`5813`	`+ typetype_alias[*_]=0`
	`5814`	`+withself.assertRaisesRegex(TypeError,".+__typing_subst__.+tuple.+int.*"):`
	`5815`	`+type_alias[evil][0]`
	`5816`	`+`
`5800`	`5817`
`5801`	`5818`	`classClassVarTests(BaseTestCase):`
`5802`	`5819`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a crash when a generic object's ``__typing_subst__`` returns an object
	`2`	+that isn't a:class:`tuple`.

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -525,12 +525,24 @@ _Py_subs_parameters(PyObject self, PyObject args, PyObject *parameters, PyObje`
`525`	`525`	`returnNULL;`
`526`	`526`	`}`
`527`	`527`	`if (unpack) {`
	`528`	`+if (!PyTuple_Check(arg)) {`
	`529`	`+Py_DECREF(newargs);`
	`530`	`+Py_DECREF(item);`
	`531`	`+Py_XDECREF(tuple_args);`
	`532`	`+PyObject*original=PyTuple_GET_ITEM(args,iarg);`
	`533`	`+PyErr_Format(PyExc_TypeError,`
	`534`	`+"expected __typing_subst__ of %T objects to return a tuple, not %T",`
	`535`	`+original,arg);`
	`536`	`+Py_DECREF(arg);`
	`537`	`+returnNULL;`
	`538`	`+ }`
`528`	`539`	`jarg=tuple_extend(&newargs,jarg,`
`529`	`540`	`&PyTuple_GET_ITEM(arg,0),PyTuple_GET_SIZE(arg));`
`530`	`541`	`Py_DECREF(arg);`
`531`	`542`	`if (jarg<0) {`
`532`	`543`	`Py_DECREF(item);`
`533`	`544`	`Py_XDECREF(tuple_args);`
	`545`	`+assert(newargs==NULL);`
`534`	`546`	`returnNULL;`
`535`	`547`	`}`
`536`	`548`	`}`

Comments

(0)