summaryrefslogtreecommitdiffstats
path: root/Python/frame.c
diff options
context:
space:
mode:
authorBrandt Bucher <brandtbucher@microsoft.com>2022-12-06 14:01:38 (GMT)
committerGitHub <noreply@github.com>2022-12-06 14:01:38 (GMT)
commitb72014c783e5698beb18ee1249597e510b8bcb5a (patch)
tree348e6b38b80f9ec04a12f94d99c1199ebaa75c1c /Python/frame.c
parent85d5a7e8ef472a4a64e5de883cf313c111a8ec77 (diff)
downloadcpython-b72014c783e5698beb18ee1249597e510b8bcb5a.zip
cpython-b72014c783e5698beb18ee1249597e510b8bcb5a.tar.gz
cpython-b72014c783e5698beb18ee1249597e510b8bcb5a.tar.bz2
GH-99729: Unlink frames before clearing them (GH-100030)
Diffstat (limited to 'Python/frame.c')
-rw-r--r--Python/frame.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/frame.c b/Python/frame.c
index 52f6ef4..b1525cc 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -127,6 +127,9 @@ _PyFrame_Clear(_PyInterpreterFrame *frame)
* to have cleared the enclosing generator, if any. */
assert(frame->owner != FRAME_OWNED_BY_GENERATOR ||
_PyFrame_GetGenerator(frame)->gi_frame_state == FRAME_CLEARED);
+ // GH-99729: Clearing this frame can expose the stack (via finalizers). It's
+ // crucial that this frame has been unlinked, and is no longer visible:
+ assert(_PyThreadState_GET()->cframe->current_frame != frame);
if (frame->frame_obj) {
PyFrameObject *f = frame->frame_obj;
frame->frame_obj = NULL;