[3.13] gh-132869: Fix crash in _PyObject_TryGetInstanceAttribute#133700
Merged
Conversation
This fixes a crash in `_PyObject_TryGetInstanceAttribute` due to the use of `_PyDictKeys_StringLookup` on an unlocked dictionary that may be concurrently modified. The underlying bug was already fixed in 3.14 and the main branch. (partially cherry picked from commit 1b15c89)
colesbury
commented
May 8, 2025
| #endif | ||
|
|
||
| static Py_ssize_t | ||
| unicodekeys_lookup_split(PyDictKeysObject* dk, PyObject *key, Py_hash_t hash) |
Contributor
Author
There was a problem hiding this comment.
FYI, the dictobject.c changes are taken verbatim from main
Contributor
|
Thanks @colesbury ! |
mpage
approved these changes
May 8, 2025
Contributor
|
Looks like this still needs merging? |
methane
approved these changes
May 14, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes a crash in
_PyObject_TryGetInstanceAttributedue to the use of_PyDictKeys_StringLookupon an unlocked dictionary that may be concurrently modified.The underlying bug was already fixed in 3.14 and the main branch.
(partially cherry picked from commit 1b15c89)