-
-
Notifications
You must be signed in to change notification settings - Fork 33.7k
gh-142495: make defaultdict keep existed value when racing with __missing__
#142668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
LindaSummer
wants to merge
7
commits into
python:main
Choose a base branch
from
LindaSummer:defaultdict
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+51
−5
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
picnixz
reviewed
Dec 13, 2025
Modules/_collectionsmodule.c
Outdated
Comment on lines
2234
to
2241
| PyObject* result; | ||
| PyDict_SetDefaultRef(op, key, value, &result); | ||
| // when PyDict_SetDefaultRef() < 0, result will be NULL | ||
| // when PyDict_SetDefaultRef() == 0, result is a new reference of default value | ||
| // when PyDict_SetDefaultRef() > 0, result is a new reference to the existing value | ||
| // so the value reference must be decref'ed in all cases | ||
| Py_DECREF(value); | ||
| return result; |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
| PyObject* result; | |
| PyDict_SetDefaultRef(op, key, value, &result); | |
| // when PyDict_SetDefaultRef() < 0, result will be NULL | |
| // when PyDict_SetDefaultRef() == 0, result is a new reference of default value | |
| // when PyDict_SetDefaultRef() > 0, result is a new reference to the existing value | |
| // so the value reference must be decref'ed in all cases | |
| Py_DECREF(value); | |
| return result; | |
| PyObject *result = NULL; | |
| (void)PyDict_SetDefaultRef(op, key, value, &result); | |
| // 'result' is NULL, or a strong reference to 'value' or 'op[key]' | |
| Py_DECREF(value); | |
| return result; |
Contributor
Author
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @picnixz ,
Thanks very much for your suggestion! ❤
I have updated this part as suggested.
Best Regards,
Edward
b57dd36 to
57064dc
Compare
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.
Issue
#142495
Proposed Changes
PyDict_SetDefaultRefto guard the object update and keep existed value.Comment
The
PyDict_SetDefaultRefwould increase the reference count of the setted item, so we must decrement the refrence count on__missing__created object to avoid memory leak.