Skip to content

gh-130547: Fix race between dict_dealloc and split_keys_entry_added #130778

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 4, 2025
Merged

gh-130547: Fix race between dict_dealloc and split_keys_entry_added #130778

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b46f65
gh-130547: Fix race between dict_dealloc and split_keys_entry_added
corona10 Mar 3, 2025
9a47201
Revert declaration
corona10 Mar 3, 2025
41387ae
Address code review
corona10 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,7 +3254,7 @@ dict_dealloc(PyObject *self)
Py_TRASHCAN_BEGIN(mp, dict_dealloc)
if (values != NULL) {
if (values->embedded == 0) {
for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) {
for (i = 0, n = FT_ATOMIC_LOAD_SSIZE_RELAXED(mp->ma_keys->dk_nentries); i < n; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also do n = values->capacity, which seems a bit cleaner to me because values->capacity never changes.

Py_XDECREF(values->values[i]);
}
free_values(values, false);
Expand Down
Loading