gh-109786: Fix leaks and crash when re-enter itertools.pairwise.__next__() (GH-109788)

This commit is contained in:
Serhiy Storchaka 2023-12-04 13:47:55 +02:00 committed by GitHub
parent c74e9fb189
commit 6ca9d3e017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 2 deletions

View file

@ -330,21 +330,30 @@ pairwise_next(pairwiseobject *po)
return NULL;
}
if (old == NULL) {
po->old = old = (*Py_TYPE(it)->tp_iternext)(it);
old = (*Py_TYPE(it)->tp_iternext)(it);
Py_XSETREF(po->old, old);
if (old == NULL) {
Py_CLEAR(po->it);
return NULL;
}
it = po->it;
if (it == NULL) {
Py_CLEAR(po->old);
return NULL;
}
}
Py_INCREF(old);
new = (*Py_TYPE(it)->tp_iternext)(it);
if (new == NULL) {
Py_CLEAR(po->it);
Py_CLEAR(po->old);
Py_DECREF(old);
return NULL;
}
/* Future optimization: Reuse the result tuple as we do in enumerate() */
result = PyTuple_Pack(2, old, new);
Py_SETREF(po->old, new);
Py_XSETREF(po->old, new);
Py_DECREF(old);
return result;
}