mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
gh-101892: Fix SystemError
when a callable iterator call exhausts the iterator (GH-101896)
(cherry picked from commit 705487c655
)
Co-authored-by: Raj <51259329+workingpayload@users.noreply.github.com>
Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>
This commit is contained in:
parent
00791f23b7
commit
06a3bb8c94
3 changed files with 30 additions and 2 deletions
|
@ -222,7 +222,7 @@ calliter_iternext(calliterobject *it)
|
|||
}
|
||||
|
||||
result = _PyObject_CallNoArgs(it->it_callable);
|
||||
if (result != NULL) {
|
||||
if (result != NULL && it->it_sentinel != NULL){
|
||||
int ok;
|
||||
|
||||
ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ);
|
||||
|
@ -230,7 +230,6 @@ calliter_iternext(calliterobject *it)
|
|||
return result; /* Common case, fast path */
|
||||
}
|
||||
|
||||
Py_DECREF(result);
|
||||
if (ok > 0) {
|
||||
Py_CLEAR(it->it_callable);
|
||||
Py_CLEAR(it->it_sentinel);
|
||||
|
@ -241,6 +240,7 @@ calliter_iternext(calliterobject *it)
|
|||
Py_CLEAR(it->it_callable);
|
||||
Py_CLEAR(it->it_sentinel);
|
||||
}
|
||||
Py_XDECREF(result);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue