gh-146452: Fix pickle segfault when pickling dict with concurrent mutation#146470
Open
overlorde wants to merge 2 commits intopython:mainfrom
Open
gh-146452: Fix pickle segfault when pickling dict with concurrent mutation#146470overlorde wants to merge 2 commits intopython:mainfrom
overlorde wants to merge 2 commits intopython:mainfrom
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
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.
batch_dict_exact()in_pickle.citerates dict items usingPyDict_Next()which returns borrowed references. Without a critical section, a concurrent dict mutation can invalidate the borrowed reference beforePy_INCREF, causing a segfault.The fix wraps
PyDict_Next()+Py_INCREFinPy_BEGIN_CRITICAL_SECTION(obj)to prevent the dict from being mutated while converting borrowed refs to owned refs. Same approach as the existing set iteration path in the same file (line 3656).Crashes on both 3.14t (stock install) and main (with ASan). Reproducer in the linked issue.
test_picklepasses (1000 tests, no regressions)test_free_threading/test_pickle.pythat segfaults without the fix and passes with it