Skip to content

gh-101892: Fix SystemError when a callable iterator call exhausts the iterator #101896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 19 commits into from
Mar 4, 2023
Merged

gh-101892: Fix SystemError when a callable iterator call exhausts the iterator #101896

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
de17a82
gh-101892 : Updated Cython/objects/iterobject.c Line 217
workingpayload Feb 14, 2023
3fba831
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 14, 2023
bee2af7
Clarify the news entry
arhadthedev Feb 14, 2023
25f4c06
Merge branch 'main' into workingpayload/issue101892
workingpayload Feb 14, 2023
0c631e3
Add a test
arhadthedev Feb 14, 2023
506fb6a
Amend wording
arhadthedev Feb 14, 2023
78168bf
Rep
arhadthedev Feb 15, 2023
188e388
Address the review
arhadthedev Feb 15, 2023
0f9cea1
gh-101892 : Updated Cython/objects/iterobject.c Line 217
workingpayload Feb 15, 2023
6abb09a
Merge branch 'main' into workingpayload/issue101892
workingpayload Feb 15, 2023
c8b6bad
Update test_iter.py
arhadthedev Feb 15, 2023
6931c20
Remove an unnecessary abstraction of reentrance
arhadthedev Feb 15, 2023
36b043c
Clarify comments once more
arhadthedev Feb 15, 2023
340f668
Update 2023-02-14-09-08-48.gh-issue-101892.FMos8l.rst
arhadthedev Feb 15, 2023
fe1502d
Fix issues reported by patchcheck
arhadthedev Feb 15, 2023
b9065d9
Merge branch 'main' into workingpayload/issue101892
arhadthedev Mar 4, 2023
cc2066b
Do not nitpick for empty lines of others
arhadthedev Mar 4, 2023
27e478f
Fix mismerging: move the new method
arhadthedev Mar 4, 2023
1ee2293
Address the review
arhadthedev Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-101892 : Updated Cython/objects/iterobject.c Line 217 
Updated Cython/objects/iterobject.c Line 217
  • Loading branch information
@workingpayload
workingpayload committed Feb 14, 2023
commit de17a828d543975215daf97b46df96e80774a414
2 changes: 1 addition & 1 deletion Objects/iterobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ calliter_iternext(calliterobject *it)
}

result = _PyObject_CallNoArgs(it->it_callable);
if (result != NULL) {
if (result != NULL && it->it_callable != NULL) {
Copy link
Copy Markdown
Contributor

@OTheDev OTheDev Feb 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but this won't fix it. Notice the first if statement in the function. If it->it_callable == NULL is true, NULL is returned. So it->it_callable != NULL is already guaranteed at this point.

Copy link
Copy Markdown
Contributor Author

@workingpayload workingpayload Feb 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if we check it->it_sentinel != NULL ?

int ok;

ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ);
Expand Down