[3.7] bpo-38395: Fix ownership in weakref.proxy methods (GH-16632) #16663
Conversation
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
ned-deily
requested changes
Oct 8, 2019
Objects/weakrefobject.c
Outdated
|
|
||
| <<<<<<< HEAD |
There was a problem hiding this comment.
This appears to be an unresolved merge conflict.
There was a problem hiding this comment.
Ooops... Sorry, I missed this one while manually backporting :( Fixed in b68f6d6
Thanks, Ned!
|
When you're done making the requested changes, leave the comment: |
The implementation of weakref.proxy's methods call back into the Python API using a borrowed references of the weakly referenced object (acquired via PyWeakref_GET_OBJECT). This API call may delete the last reference to the object (either directly or via GC), leaving a dangling pointer, which can be subsequently dereferenced. To fix this, claim a temporary ownership of the referenced object when calling the appropriate method. Some functions because at the moment they do not need to access the borrowed referent, but to protect against future changes to these functions, ownership need to be fixed in all potentially affected methods.. (cherry picked from commit 10cd00a) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
pablogsal
force-pushed
the
backport-10cd00a-3.7
branch
from
f82b200 to
b68f6d6
Compare
|
I have made the requested changes; please review again |
|
Thanks for making the requested changes! @ned-deily: please review the changes made to this pull request. |
ned-deily
approved these changes
Oct 11, 2019
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.
The implementation of weakref.proxy's methods call back into the Python
API using a borrowed references of the weakly referenced object
(acquired via PyWeakref_GET_OBJECT). This API call may delete the last
reference to the object (either directly or via GC), leaving a dangling
pointer, which can be subsequently dereferenced.
To fix this, claim a temporary ownership of the referenced object when
calling the appropriate method. Some functions because at the moment they
do not need to access the borrowed referent, but to protect against
future changes to these functions, ownership need to be fixed in
all potentially affected methods..
(cherry picked from commit 10cd00a)
Co-authored-by: Pablo Galindo Pablogsal@gmail.com
https://bugs.python.org/issue38395
Automerge-Triggered-By: @ned-deily