Skip to content

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

Merged
erlend-aasland merged 7 commits into
python:mainfrom
tom-pytel:fix-issue-128961
Jan 18, 2025
Merged

gh-128961: Fix exhausted array iterator crash in __setstate__#128962
erlend-aasland merged 7 commits into
python:mainfrom
tom-pytel:fix-issue-128961

Conversation

@tom-pytel

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

Copy link
Copy Markdown
Contributor

@bedevere-appbedevere-appBot mentioned this pull request Jan 17, 2025
Closed
@bedevere-app

bedevere-appBot commented Jan 17, 2025

Copy link
Copy Markdown

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

bedevere-appBot commented Jan 17, 2025

Copy link
Copy Markdown

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

@sobolevnsobolevn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

style nit :)

Comment threadModules/arraymodule.c Outdated
Comment threadModules/arraymodule.c Outdated
tomasr8
tomasr8 reviewed Jan 17, 2025
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2025-01-17-21-33-11.gh-issue-128961.XwvyIZ.rst Outdated
@erlend-aasland

erlend-aasland commented Jan 17, 2025

Copy link
Copy Markdown
Contributor

Thanks, @tom-pytel!

erlend-aasland
erlend-aasland reviewed Jan 17, 2025
View reviewed changes
Comment threadLib/test/test_array.py
erlend-aasland
erlend-aasland reviewed Jan 17, 2025
View reviewed changes
Comment threadLib/test/test_array.py Outdated
@erlend-aaslanderlend-aasland added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Jan 18, 2025
picnixz
picnixz reviewed Jan 18, 2025
View reviewed changes
Comment threadModules/arraymodule.c
@erlend-aasland

erlend-aasland commented Jan 18, 2025

Copy link
Copy Markdown
Contributor

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

@erlend-aaslanderlend-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:mainJan 18, 2025
@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

bedevere-appBot commented Jan 18, 2025

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Jan 18, 2025
@bedevere-app

bedevere-appBot commented Jan 18, 2025

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.12 only 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

ZeroIntensity commented Jan 18, 2025•
edited
Loading

Copy link
Copy Markdown
Member

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

@tom-pytel

tom-pytel commented Jan 18, 2025

Copy link
Copy Markdown
ContributorAuthor

@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)
@tom-pytel
tom-pytel deleted the fix-issue-128961 branch March 31, 2025 11:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sobolevnsobolevnsobolevn left review comments
@tomasr8tomasr8tomasr8 approved these changes
@picnixzpicnixzpicnixz approved these changes
@erlend-aaslanderlend-aaslanderlend-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