Repository navigation
gh-158820: Add null checks to avoid segfaults with lazy imports at shutdown - #158821
Merged
Merged
Conversation
Destructors can run after finalization has cleared the interpreter's lazy_modules set and lazy_pending_submodules dict. Declaring or resolving a lazy import from one of them passed NULL to PySet_Add(), PySet_Discard() or the pending-submodules lookup. Treat the bookkeeping as a no-op once the state is gone, as the other readers of this state already do.
brittanyrey
requested review from
DinoV,
FFY00,
Yhg1s,
brettcannon,
ericsnowcurrently,
kumaraditya303,
ncoghlan,
pablogsal and
warsaw
as code owners
October 5, 2026 01:57
pablogsal
approved these changes
Oct 5, 2026
Contributor
Author
|
Addressed comments in new commit |
brettcannon
removed their request for review
October 5, 2026 21:18
encukou
added
awaiting merge
needs backport to 3.15
|
Thanks @brittanyrey for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.15. |
|
GH-159062 is a backport of this pull request to the 3.15 branch. |
bedevere-app
Bot
removed
the
needs backport to 3.15
JelleZijlstra
pushed a commit
that referenced
this pull request
Oct 9, 2026
…s at shutdown (GH-158821) (#159062) gh-158820: Add null checks to avoid segfaults with lazy imports at shutdown (GH-158821) Destructors can run after finalization has cleared the interpreter's lazy_modules set and lazy_pending_submodules dict. Declaring or resolving a lazy import from one of them passed NULL to PySet_Add(), PySet_Discard() or the pending-submodules lookup. Treat the bookkeeping as a no-op once the state is gone, as the other readers of this state already do. (cherry picked from commit a6e6361) Co-authored-by: Brittany Reynoso <breynoso@meta.com>
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.
Additional finalizers can run after
finalize_modules()has cleared the interpreter'slazy_modulesset andlazy_pending_submodulesdict. In the perfect storm, this can lead to a seg fault when accessing either container without checking if the object is still allocated.