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

(cherry picked from commit 4dade055f4)

Co-authored-by: Tomasz Pytel <tompytel@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-01-18 11:14:07 +01:00 committed by GitHub
parent 8a8f5d636d
commit 405f6d72bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 5 deletions

View file

@ -2966,11 +2966,16 @@ array_arrayiterator___setstate__(arrayiterobject *self, PyObject *state)
Py_ssize_t index = PyLong_AsSsize_t(state);
if (index == -1 && PyErr_Occurred())
return NULL;
if (index < 0)
index = 0;
else if (index > Py_SIZE(self->ao))
index = Py_SIZE(self->ao); /* iterator exhausted */
self->index = index;
arrayobject *ao = self->ao;
if (ao != NULL) {
if (index < 0) {
index = 0;
}
else if (index > Py_SIZE(ao)) {
index = Py_SIZE(ao); /* iterator exhausted */
}
self->index = index;
}
Py_RETURN_NONE;
}