Skip to content
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

Jump to bottom

gh-128961: Fix exhausted array iterator crash in __setstate__ #128962

Merged
merged 7 commits into from
Jan 18, 2025
Merged

gh-128961: Fix exhausted array iterator crash in __setstate__ #128962

merged 7 commits into from
Jan 18, 2025

Conversation

tom-pytel
Copy link
Contributor

@tom-pytel tom-pytel commented Jan 17, 2025 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Jan 17, 2025
Closed
@bedevere-app
Copy link

bedevere-app bot commented Jan 17, 2025

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@bedevere-app
Copy link

bedevere-app bot commented Jan 17, 2025

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

sobolevn
sobolevn reviewed Jan 17, 2025
View reviewed changes
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

style nit :)

Modules/arraymodule.c Outdated Show resolved Hide resolved
Modules/arraymodule.c Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor

Thanks, @tom-pytel!

@erlend-aasland erlend-aasland added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Jan 18, 2025
@erlend-aasland
Copy link
Contributor

@sobolevn's PEP-7 remarks were addressed with e7f00dc. Looks like we're good to go. Thanks a lot, @tom-pytel!

@erlend-aasland erlend-aasland changed the title gh-128961: fix exhausted array iterator crash on __setstate__ gh-128961: Fix exhausted array iterator crash in __setstate__ Jan 18, 2025
@erlend-aasland erlend-aasland merged commit 4dade05 into python:main Jan 18, 2025
49 checks passed
@miss-islington-app

This comment was marked as outdated.

Sign in to view
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 18, 2025
@tom-pytel @miss-islington
pythongh-128961: Fix exhausted array iterator crash in __setstate__() (…
29cbdab 
…pythonGH-128962)

(cherry picked from commit 4dade05)

Co-authored-by: Tomasz Pytel <tompytel@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 18, 2025
@tom-pytel @miss-islington
pythongh-128961: Fix exhausted array iterator crash in __setstate__() (…
bf59715 
…pythonGH-128962)

(cherry picked from commit 4dade05)

Co-authored-by: Tomasz Pytel <tompytel@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Jan 18, 2025

GH-128976 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 security fixes label Jan 18, 2025
@bedevere-app
Copy link

bedevere-app bot commented Jan 18, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Jan 18, 2025
erlend-aasland pushed a commit that referenced this pull request Jan 18, 2025
@miss-islington @tom-pytel
[3.12] gh-128961: Fix exhausted array iterator crash in __setstate__() (
405f6d7 
GH-128962) (#128977)

(cherry picked from commit 4dade05)

Co-authored-by: Tomasz Pytel <tompytel@gmail.com>
erlend-aasland pushed a commit that referenced this pull request Jan 18, 2025
@miss-islington @tom-pytel
[3.13] gh-128961: Fix exhausted array iterator crash in __setstate__() (
c75894a 
GH-128962) (#128976)

(cherry picked from commit 4dade05)

Co-authored-by: Tomasz Pytel <tompytel@gmail.com>
@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@ZeroIntensity
Copy link
Member

ZeroIntensity commented Jan 18, 2025 •
edited
Loading

@tom-pytel Is this your first merged PR? If so, congrats! (The buildbot failure is unrelated, FWIW.)

@tom-pytel
Copy link
Contributor Author

@tom-pytel Is this your first merged PR? If so, congrats! (The buildbot failure is unrelated, FWIW.)

Yup, first official PR so thank you. I did python internals at at a company a couple years back so not my first cpython rodeo, but free-threading and the quickening/specialization stuff is new.

srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 21, 2025
@tom-pytel @srinivasreddy
pythongh-128961: Fix exhausted array iterator crash in __setstate__() (…
e0f3786 
…python#128962)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sobolevn sobolevn sobolevn left review comments

@tomasr8 tomasr8 tomasr8 approved these changes

@picnixz picnixz picnixz approved these changes

@erlend-aasland erlend-aasland erlend-aasland approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tom-pytel @erlend-aasland @bedevere-bot @ZeroIntensity @sobolevn @tomasr8 @picnixz