summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Python/gc_free_threading.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
index e981f87..c645f1b 100644
--- a/Python/gc_free_threading.c
+++ b/Python/gc_free_threading.c
@@ -186,7 +186,20 @@ frame_disable_deferred_refcounting(_PyInterpreterFrame *frame)
// Convert locals, variables, and the executable object to strong
// references from (possibly) deferred references.
assert(frame->stackpointer != NULL);
+ assert(frame->owner == FRAME_OWNED_BY_FRAME_OBJECT ||
+ frame->owner == FRAME_OWNED_BY_GENERATOR);
+
frame->f_executable = PyStackRef_AsStrongReference(frame->f_executable);
+
+ if (frame->owner == FRAME_OWNED_BY_GENERATOR) {
+ PyGenObject *gen = _PyGen_GetGeneratorFromFrame(frame);
+ if (gen->gi_frame_state == FRAME_CLEARED) {
+ // gh-124068: if the generator is cleared, then most fields other
+ // than f_executable are not valid.
+ return;
+ }
+ }
+
for (_PyStackRef *ref = frame->localsplus; ref < frame->stackpointer; ref++) {
if (!PyStackRef_IsNull(*ref) && PyStackRef_IsDeferred(*ref)) {
*ref = PyStackRef_AsStrongReference(*ref);