bpo-1635741: Fix unicode_dealloc() for mortal interned string - #21270
Merged
Conversation
When unicode_dealloc() is called on a mortal interned string, the string reference counter is now reset at zero, rather than leaking one reference.
Member
Author
shihai1991
reviewed
Jul 2, 2020
| PyDict_DelItem(). */ | ||
| assert(Py_REFCNT(unicode) == 0); | ||
| Py_SET_REFCNT(unicode, 3); | ||
| if (PyDict_DelItem(interned, unicode) != 0) { |
Member
There was a problem hiding this comment.
Can we skip PyDict_DelItem() and set interned unicode's refcnt = 0 directly in here?
Member
Author
There was a problem hiding this comment.
We cannot remove the PyDict_DelItem() call.
PyUnicode_InternInPlace() uses black magic: it ignores 2 references (key and value) of the interned dictionary.
We must remove the string from the interned dictionary. Otherwise, the dictionary will contain a dangling pointer when unicode_dealloc() completes: using the dict is likely to crash in this case.
shihai1991
approved these changes
Jul 2, 2020
shihai1991
left a comment
shihai1991
left a comment
Member
There was a problem hiding this comment.
Thanks victor's PR, LGTM :)
Member
Author
|
Technically, this change is mostly a cleanup, since the object is destroyed anyway a few lines below. |
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.
When unicode_dealloc() is called on a mortal interned string, the
string reference counter is now reset at zero, rather than leaking
one reference.
https://bugs.python.org/issue1635741