-
-
Notifications
You must be signed in to change notification settings - Fork 30.3k
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
GH-97002: Prevent _PyInterpreterFrame
s from backing more than one PyFrameObject
#97996
Conversation
Thanks @brandtbucher for the PR, and @markshannon for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11. |
GH-98002 is a backport of this pull request to the 3.11 branch. |
… one `PyFrameObject` (pythonGH-97996) (cherry picked from commit 21a2d9f) Co-authored-by: Brandt Bucher <[email protected]>
* main: pythonGH-97002: Prevent `_PyInterpreterFrame`s from backing more than one `PyFrameObject` (pythonGH-97996) pythongh-97973: Return all necessary information from the tokenizer (pythonGH-97984) fixes pythongh-96078: os.sched_yield release the GIL while calling sched_yield(2). (pythongh-97965) pythongh-65961: Do not rely solely on `__cached__` (pythonGH-97990) pythongh-97850: Remove the open issues section from the import reference (python#97935) Docs: pin sphinx-lint (pythonGH-97992) pythongh-94590: add signatures to operator itemgetter, attrgetter, methodcaller (python#94591) Add Pynche's move to the What's new in 3.11 (python#97974) pythongh-97781: Apply changes from importlib_metadata 5. (pythonGH-97785) pythongh-86482: Document assignment expression need for ()s (python#23291) pythongh-97943: PyFunction_GetAnnotations should return a borrowed reference. (python#97949)
… one `PyFrameObject` (pythonGH-97996)
// Just pretend that we have an owned, cleared frame so frame_dealloc | ||
// doesn't make the situation worse: | ||
f->f_frame = (_PyInterpreterFrame *)f->_f_frame_data; | ||
f->f_frame->owner = FRAME_CLEARED; |
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.
FRAME_CLEARED
is a value of enum _framestate
. Shouldn’t ->owner
be a value of enum _frameowner
instead?
There is a nasty situation where a GC collection during
PyFrameObject
allocation could create multiplePyFrameObject
s for the same_PyInterpreterFrame
, which breaks our ownership rules and creates all sorts of opportunities for accessing corrupted memory.If this happens, we just keep the
PyFrameObject
that has already been exposed to user code, and throw away the duplicate.PyFrameObject
s can be created for a single_PyInterpreterFrame
#97002