{{ message }}
gh-151627: protect OrderedDict iterator creation - #151688
Merged
kumaraditya303 merged 1 commit intoAug 1, 2026
Merged
Conversation
Contributor
Author
pedramkarimii
force-pushed
the
gh-151627-odict-iterator-race
branch
from
June 20, 2026 04:22
4762cdd to
ba229fd
Compare
kumaraditya303
approved these changes
Aug 1, 2026
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
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.

Fixes gh-151627.
In free-threaded builds,
OrderedDictiterator creation could read the ordered linked-list head/tail, the current node key, the size, andod_statewithout holding theOrderedDictcritical section. A concurrentclear()orupdate()could mutate or free the linked-list nodes whileodictiter_new()was taking that initial iterator snapshot, leading to a data race and a crash/use-after-free.This change protects the initial iterator snapshot in
odictiter_new()with theOrderedDictcritical section. The mutation paths already update the linked-list state while holding theOrderedDictlock, so taking the iterator's initial current key, size, state, and object reference under the same critical section avoids racing with concurrentclear()/update().This is separate from gh-151633/gh-151634, which address
Counter.update()in_collectionsmodule.c. This PR targetsOrderedDictiterator construction inObjects/odictobject.c.A free-threading regression test was added that repeatedly creates forward and reversed
OrderedDictiterators while another thread concurrently clears and updates the sameOrderedDict.Tests run:
./python -m test test_free_threading.test_collections -v
./python -m test test_free_threading.test_collections -v -m test_iterator_update_clear_race
./python -m test test_ordered_dict -v
./python ../gh151627_reproducer.py