Commit405f6d7

and

authored

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

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

1 parent8a8f5d6 commit405f6d7Copy full SHA for 405f6d7

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
`@@ -1609,5 +1609,13 @@ def test_tolist(self, size):`
`1609`	`1609`	`self.assertEqual(ls[:8],list(example[:8]))`
`1610`	`1610`	`self.assertEqual(ls[-8:],list(example[-8:]))`
`1611`	`1611`
	`1612`	`+deftest_gh_128961(self):`
	`1613`	`+a=array.array('i')`
	`1614`	`+it=iter(a)`
	`1615`	`+list(it)`
	`1616`	`+it.__setstate__(0)`
	`1617`	`+self.assertRaises(StopIteration,next,it)`
	`1618`	`+`
	`1619`	`+`
`1612`	`1620`	`if__name__=="__main__":`
`1613`	`1621`	`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
`@@ -2966,11 +2966,16 @@ array_arrayiterator___setstate__(arrayiterobject self, PyObject state)`
`2966`	`2966`	`Py_ssize_tindex=PyLong_AsSsize_t(state);`
`2967`	`2967`	`if (index==-1&&PyErr_Occurred())`
`2968`	`2968`	`returnNULL;`
`2969`		`-if (index<0)`
`2970`		`-index=0;`
`2971`		`-elseif (index>Py_SIZE(self->ao))`
`2972`		`-index=Py_SIZE(self->ao);/* iterator exhausted */`
`2973`		`-self->index=index;`
	`2969`	`+arrayobject*ao=self->ao;`
	`2970`	`+if (ao!=NULL) {`
	`2971`	`+if (index<0) {`
	`2972`	`+index=0;`
	`2973`	`+ }`
	`2974`	`+elseif (index>Py_SIZE(ao)) {`
	`2975`	`+index=Py_SIZE(ao);/* iterator exhausted */`
	`2976`	`+ }`
	`2977`	`+self->index=index;`
	`2978`	`+ }`
`2974`	`2979`	`Py_RETURN_NONE;`
`2975`	`2980`	`}`
`2976`	`2981`

Comments

(0)