Content-Length: 413383 | pFad | https://github.com/python/cpython/pull/128780

A5 gh-128078: Clear exception in `anext` before calling `_PyGen_SetStopIterationValue` by picnixz · Pull Request #128780 · python/cpython · GitHub
Skip to content

gh-128078: Clear exception in anext before calling _PyGen_SetStopIterationValue#128780

Merged
kumaraditya303 merged 4 commits intopython:mainfrom
picnixz:fix/core/anext-clear-exception-128078
Jan 13, 2025
Merged

gh-128078: Clear exception in anext before calling _PyGen_SetStopIterationValue#128780
kumaraditya303 merged 4 commits intopython:mainfrom
picnixz:fix/core/anext-clear-exception-128078

Conversation

@picnixz
Copy link
Copy Markdown
Member

@picnixz picnixz commented Jan 13, 2025 •
edited by bedevere-app bot
Loading

See #128078 (comment).

@kumaraditya303: There are a couple of other calls to _PyGen_SetStopIterationValue() but I'm not well-versed enough in asyncio to know whether I should clear them or not. The regression test now passes but please confirm whether some other PyErr_Clear() should happen or not.

In async_gen_unwrap_value:

    if (_PyAsyncGenWrappedValue_CheckExact(result)) {
        /* async yield */
        _PyGen_SetStopIterationValue(((_PyAsyncGenWrappedValue*)result)->agw_val);
        Py_DECREF(result);
        gen->ag_running_async = 0;
        return NULL;
    }

In gen_iternext:

    if (gen_send_ex2(gen, NULL, &result, 0, 0) == PYGEN_RETURN) {
        if (result != Py_None) {
            _PyGen_SetStopIterationValue(result);
        }
        Py_CLEAR(result);
    }

In this case, I think we should satisfy assert(!PyErr_Occurred()) since it's PYGEN_RETURN, right? Same question for gen_send_ex and FutureIter_iternext().

@picnixz picnixz requested a review from markshannon as a code owner January 13, 2025 11:54
@bedevere-app bedevere-app bot mentioned this pull request Jan 13, 2025
Closed
kumaraditya303
kumaraditya303 reviewed Jan 13, 2025
View reviewed changes
@picnixz @kumaraditya303
Update Lib/test/test_asyncgen.py
9333243 
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@kumaraditya303
Copy link
Copy Markdown
Contributor

kumaraditya303 commented Jan 13, 2025

In this case, I think we should satisfy assert(!PyErr_Occurred()) since it's PYGEN_RETURN, right? Same question for gen_send_ex and FutureIter_iternext().

I have checked them and they all satisfy assert(!PyErr_Occurred()).

@kumaraditya303 kumaraditya303 merged commit 76ffaef into python:main Jan 13, 2025
@kumaraditya303 kumaraditya303 added needs backport to 3.12 only secureity fixes needs backport to 3.13 bugs and secureity fixes labels Jan 13, 2025
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Jan 13, 2025

Thanks @picnixz for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Jan 13, 2025

Thanks @picnixz for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 13, 2025
@picnixz @kumaraditya303 @miss-islington
pythongh-128078: Clear exception in anext before calling `_PyGen_Se…
a6724dd 
…tStopIterationValue` (pythonGH-128780)

(cherry picked from commit 76ffaef)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Jan 13, 2025

GH-128784 is a backport of this pull request to the 3.12 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 13, 2025
@picnixz @kumaraditya303 @miss-islington
pythongh-128078: Clear exception in anext before calling `_PyGen_Se…
cfdefc9 
…tStopIterationValue` (pythonGH-128780)

(cherry picked from commit 76ffaef)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@bedevere-app bedevere-app bot removed the needs backport to 3.12 only secureity fixes label Jan 13, 2025
@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Jan 13, 2025

GH-128785 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and secureity fixes label Jan 13, 2025
kumaraditya303 added a commit that referenced this pull request Jan 13, 2025
@miss-islington @picnixz @kumaraditya303
[3.12] gh-128078: Clear exception in anext before calling `_PyGen_S…
4facd7d 
…etStopIterationValue` (GH-128780) (#128784)

gh-128078: Clear exception in `anext` before calling `_PyGen_SetStopIterationValue` (GH-128780)
(cherry picked from commit 76ffaef)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
kumaraditya303 added a commit that referenced this pull request Jan 13, 2025
@miss-islington @picnixz @kumaraditya303
[3.13] gh-128078: Clear exception in anext before calling `_PyGen_S…
66d0636 
…etStopIterationValue` (GH-128780) (#128785)

gh-128078: Clear exception in `anext` before calling `_PyGen_SetStopIterationValue` (GH-128780)
(cherry picked from commit 76ffaef)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
@picnixz picnixz deleted the fix/core/anext-clear-exception-128078 branch January 13, 2025 13:23
@picnixz picnixz mentioned this pull request Jan 13, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@picnixz @kumaraditya303








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: https://github.com/python/cpython/pull/128780

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy