Commitfc7f4c3

and

authored

gh-134119: Fix crash from calling next() on exhausted template iterator (#134120)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>

1 parent84914ad commitfc7f4c3Copy full SHA for fc7f4c3

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,13 @@ def test_iter(self):`
`148`	`148`	`self.assertEqual(res[1].format_spec,'')`
`149`	`149`	`self.assertEqual(res[2],' yz')`
`150`	`150`
	`151`	`+deftest_exhausted(self):`
	`152`	`+# See https://github.com/python/cpython/issues/134119.`
	`153`	`+template_iter=iter(t"{1}")`
	`154`	`+self.assertIsInstance(next(template_iter),Interpolation)`
	`155`	`+self.assertRaises(StopIteration,next,template_iter)`
	`156`	`+self.assertRaises(StopIteration,next,template_iter)`
	`157`	`+`
`151`	`158`
`152`	`159`	`if__name__=='__main__':`
`153`	`160`	`unittest.main()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix crash when calling:func:`next` on an exhausted template string iterator.
	`2`	`+Patch by Jelle Zijlstra.`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ templateiter_next(PyObject *op)`
`23`	`23`	`if (self->from_strings) {`
`24`	`24`	`item=PyIter_Next(self->stringsiter);`
`25`	`25`	`self->from_strings=0;`
	`26`	`+if (item==NULL) {`
	`27`	`+returnNULL;`
	`28`	`+ }`
`26`	`29`	`if (PyUnicode_GET_LENGTH(item)==0) {`
`27`	`30`	`Py_SETREF(item,PyIter_Next(self->interpolationsiter));`
`28`	`31`	`self->from_strings=1;`

Comments

(0)