gh-116664: Ensure thread-safe dict access in _warnings #116768
Merged
Conversation
This file contains 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
erlend-aasland
force-pushed
the
nogil/warnings-dict-getitem
branch
from
cedf1cf
to
4d4371c
Compare
colesbury
reviewed
Mar 13, 2024
Python/_warnings.c
Outdated
| *module = PyUnicode_FromString("<string>"); | ||
| if (*module == NULL) | ||
| goto handle_error; | ||
| } | ||
| else { | ||
| assert(Py_IsNone(*module) || PyUnicode_Check(*module)); |
There was a problem hiding this comment.
I think we need to handle the case where *module (i.e., __name__) is not None and not a unicode object because Python code can set __name__ arbitrarily.
There was a problem hiding this comment.
4f3cd02 should fix that case:
If None or a unicode object, return successfully; else decref and fall through to the no-key case.
There was a problem hiding this comment.
Note, there is no test case for this in the test suite.
colesbury
approved these changes
Mar 14, 2024
|
Thanks for the review! |
vstinner
pushed a commit
to vstinner/cpython
that referenced
this pull request
Mar 20, 2024
…116768) Replace _PyDict_GetItemWithError() with PyDict_GetItemRef().
adorilson
pushed a commit
to adorilson/cpython
that referenced
this pull request
Mar 25, 2024
…116768) Replace _PyDict_GetItemWithError() with PyDict_GetItemRef().
diegorusso
pushed a commit
to diegorusso/cpython
that referenced
this pull request
Apr 17, 2024
…116768) Replace _PyDict_GetItemWithError() with PyDict_GetItemRef().
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Replace _PyDict_GetItemWithError() with PyDict_GetItemRef().
_warnings.cthread-safe in free-threaded build #116664