mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.14] gh-134119: Fix crash from calling next() on exhausted template iterator (GH-134120) (#134153)

Browse source 
gh-134119: Fix crash from calling next() on exhausted template iterator (GH-134120)
(cherry picked from commit fc7f4c3666)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2025-05-17 21:48:54 +02:00 • committed by GitHub
parent cca18fcbe8
commit 1ba5e65b76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_string/test_templatelib.py
View file

@ -148,6 +148,13 @@ class TemplateIterTests(unittest.TestCase):
self.assertEqual(res[1].format_spec, '') self.assertEqual(res[1].format_spec, '')
self.assertEqual(res[2], ' yz') self.assertEqual(res[2], ' yz')
def test_exhausted(self):
# See https://github.com/python/cpython/issues/134119.
template_iter = iter(t"{1}")
self.assertIsInstance(next(template_iter), Interpolation)
self.assertRaises(StopIteration, next, template_iter)
self.assertRaises(StopIteration, next, template_iter)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

2
Misc/NEWS.d/next/Core_and_Builtins/2025-05-16-20-59-12.gh-issue-134119.w8expI.rst Normal file
View file

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

3
Objects/templateobject.c
View file

@ -23,6 +23,9 @@ templateiter_next(PyObject *op)
if (self->from_strings) { if (self->from_strings) {
item = PyIter_Next(self->stringsiter); item = PyIter_Next(self->stringsiter);
self->from_strings = 0; self->from_strings = 0;
if (item == NULL) {
return NULL;
}
if (PyUnicode_GET_LENGTH(item) == 0) { if (PyUnicode_GET_LENGTH(item) == 0) {
Py_SETREF(item, PyIter_Next(self->interpolationsiter)); Py_SETREF(item, PyIter_Next(self->interpolationsiter));
self->from_strings = 1; self->from_strings = 1;