gh-131974: Fix usages of locked_deref in ctypes
#131975
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
vstinner
reviewed
Apr 2, 2025
| { | ||
| CDataObject *self = _CDataObject_CAST(myself); | ||
| Py_ssize_t size; | ||
| Py_ssize_t offset; | ||
| PyObject *proto; | ||
| void *deref = locked_deref(self); | ||
| void *deref = *(void **)self->b_ptr; |
There was a problem hiding this comment.
You may add a deref_lock_held() function for this operation.
There was a problem hiding this comment.
Eh, I don't think its necessary. A dereference is easy enough to write.
Co-authored-by: Victor Stinner <vstinner@python.org>
vstinner
reviewed
Apr 2, 2025
Modules/_ctypes/_ctypes.c
Outdated
| Py_ssize_t i; | ||
| size_t cur; | ||
| for (cur = start, i = 0; i < len; cur += step, i++) { | ||
| for (size_t cur = start, Py_ssize_t i = 0; i < len; cur += step, i++) { |
There was a problem hiding this comment.
I'm very sorry, my suggestion was not valid C code :-(
You should write it differently, example:
size_t cur = start;
for (Py_ssize_t i = 0; i < len; cur += step, i++) { There was a problem hiding this comment.
No worries, I didn't catch it either. I'll just revert it and leave the formatting as-is.
This reverts commit 011c747.
kumaraditya303
approved these changes
Apr 2, 2025
|
Merged, thank you. I don't think that this change needs to be backported to 3.13. |
|
It can't; we haven't been backporting ctypes thread safety changes. |
seehwan
pushed a commit
to seehwan/cpython
that referenced
this pull request
Apr 16, 2025
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.
We need to hold the lock as long as we plan on using the pointer, not just when we dereference it.
ctypes.Pointer.get_contentsdoesn't hold the object's lock for long enough #131974