Commitc75894a

and

authored

[3.13]gh-128961: Fix exhausted array iterator crash in __setstate__() (GH-128962) (#128976)

(cherry picked from commit4dade05)Co-authored-by: Tomasz Pytel <tompytel@gmail.com>

1 parentd8a4426 commitc75894aCopy full SHA for c75894a

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1665,5 +1665,13 @@ def test_tolist(self, size):`
`1665`	`1665`	`self.assertEqual(ls[:8],list(example[:8]))`
`1666`	`1666`	`self.assertEqual(ls[-8:],list(example[-8:]))`
`1667`	`1667`
	`1668`	`+deftest_gh_128961(self):`
	`1669`	`+a=array.array('i')`
	`1670`	`+it=iter(a)`
	`1671`	`+list(it)`
	`1672`	`+it.__setstate__(0)`
	`1673`	`+self.assertRaises(StopIteration,next,it)`
	`1674`	`+`
	`1675`	`+`
`1668`	`1676`	`if__name__=="__main__":`
`1669`	`1677`	`unittest.main()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix a crash when setting state on an exhausted:class:`array.array` iterator.

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3074,11 +3074,16 @@ array_arrayiterator___setstate__(arrayiterobject self, PyObject state)`
`3074`	`3074`	`Py_ssize_tindex=PyLong_AsSsize_t(state);`
`3075`	`3075`	`if (index==-1&&PyErr_Occurred())`
`3076`	`3076`	`returnNULL;`
`3077`		`-if (index<0)`
`3078`		`-index=0;`
`3079`		`-elseif (index>Py_SIZE(self->ao))`
`3080`		`-index=Py_SIZE(self->ao);/* iterator exhausted */`
`3081`		`-self->index=index;`
	`3077`	`+arrayobject*ao=self->ao;`
	`3078`	`+if (ao!=NULL) {`
	`3079`	`+if (index<0) {`
	`3080`	`+index=0;`
	`3081`	`+ }`
	`3082`	`+elseif (index>Py_SIZE(ao)) {`
	`3083`	`+index=Py_SIZE(ao);/* iterator exhausted */`
	`3084`	`+ }`
	`3085`	`+self->index=index;`
	`3086`	`+ }`
`3082`	`3087`	`Py_RETURN_NONE;`
`3083`	`3088`	`}`
`3084`	`3089`

Comments

(0)