Skip to content

gh-121860: Fix crash when materializing managed dict#121866

Merged
colesbury merged 3 commits into
python:mainfrom
colesbury:gh-121860-materialize-dict
Jul 16, 2024
Merged

gh-121860: Fix crash when materializing managed dict#121866
colesbury merged 3 commits into
python:mainfrom
colesbury:gh-121860-materialize-dict

Conversation

@colesbury

@colesbury colesbury commented Jul 16, 2024 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Contributor

The object's inline values may be marked invalid if the materialized dict was already initialized and then deleted.

@colesbury
pythongh-121860: Fix crash when materializing managed dict
2a2e0a7 
The object's inline values may be marked invalid if the materialized
dict was already initialized and then deleted.
@bedevere-app bedevere-app Bot mentioned this pull request Jul 16, 2024
Closed
pablogsal
pablogsal reviewed Jul 16, 2024
View reviewed changes
Comment thread Objects/dictobject.c Outdated
@colesbury
colesbury marked this pull request as ready for review July 16, 2024 18:25
@colesbury
colesbury requested review from DinoV and vstinner July 16, 2024 18:25
@pablogsal

pablogsal commented Jul 16, 2024

Copy link
Copy Markdown
Member

Confirmed that fixes Cython as well: #121860 (comment)

pablogsal
pablogsal approved these changes Jul 16, 2024
View reviewed changes

@pablogsal pablogsal 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.

LGTM

Confirmed it fixes the original issue and the Cython test

@pablogsal pablogsal added the needs backport to 3.13 bugs and security fixes label Jul 16, 2024
@colesbury
colesbury merged commit 162b41f into python:main Jul 16, 2024
@colesbury
colesbury deleted the gh-121860-materialize-dict branch July 16, 2024 18:58
@miss-islington-app

miss-islington-app Bot commented Jul 16, 2024

Copy link
Copy Markdown

Thanks @colesbury for the PR 🌮🎉.. 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 Jul 16, 2024
@colesbury @miss-islington
pythongh-121860: Fix crash when materializing managed dict (pythonGH-…
9b41ce0 
…121866)

The object's inline values may be marked invalid if the materialized
dict was already initialized and then deleted.
(cherry picked from commit 162b41f)

Co-authored-by: Sam Gross <colesbury@gmail.com>
@bedevere-app

bedevere-app Bot commented Jul 16, 2024

Copy link
Copy Markdown

GH-121867 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 Jul 16, 2024
colesbury added a commit that referenced this pull request Jul 16, 2024
@miss-islington @colesbury
[3.13] gh-121860: Fix crash when materializing managed dict (GH-121866)…
6613029 
… (#121867)

The object's inline values may be marked invalid if the materialized
dict was already initialized and then deleted.
(cherry picked from commit 162b41f)

Co-authored-by: Sam Gross <colesbury@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsal pablogsal pablogsal approved these changes
@methane methane Awaiting requested review from methane methane is a code owner
@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner
@vstinner vstinner Awaiting requested review from vstinner
@DinoV DinoV Awaiting requested review from DinoV

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

@colesbury @pablogsal