Skip to content

Commit 7134b40

Browse files
[3.14] GH-100964: Fix reference cycle in exhausted generator frames (GH-141112) (#142902)
GH-100964: Fix reference cycle in exhausted generator frames (GH-141112) (cherry picked from commit 92243dc) Co-authored-by: Savannah Ostrowski <[email protected]>
1 parent 25a9470 commit 7134b40

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

Lib/test/test_generators.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,18 @@ def gen():
134134
self.assertEqual(len(resurrected), 1)
135135
self.assertIsInstance(resurrected[0].gi_code, types.CodeType)
136136

137+
def test_exhausted_generator_frame_cycle(self):
138+
def g():
139+
yield
140+
141+
generator = g()
142+
frame = generator.gi_frame
143+
self.assertIsNone(frame.f_back)
144+
next(generator)
145+
self.assertIsNone(frame.f_back)
146+
next(generator, None)
147+
self.assertIsNone(frame.f_back)
148+
137149

138150
class GeneratorTest(unittest.TestCase):
139151

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix reference cycle in exhausted generator frames. Patch by Savannah Ostrowski.

Python/ceval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,9 +1920,9 @@ clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
19201920
tstate->exc_info = gen->gi_exc_state.previous_item;
19211921
gen->gi_exc_state.previous_item = NULL;
19221922
assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
1923+
frame->previous = NULL;
19231924
_PyFrame_ClearExceptCode(frame);
19241925
_PyErr_ClearExcState(&gen->gi_exc_state);
1925-
frame->previous = NULL;
19261926
}
19271927

19281928
void

0 commit comments

Comments
 (0)