diff options
| author | Brandt Bucher <brandtbucher@microsoft.com> | 2022-12-06 14:01:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 14:01:38 (GMT) |
| commit | b72014c783e5698beb18ee1249597e510b8bcb5a (patch) | |
| tree | 348e6b38b80f9ec04a12f94d99c1199ebaa75c1c /Python/ceval.c | |
| parent | 85d5a7e8ef472a4a64e5de883cf313c111a8ec77 (diff) | |
| download | cpython-b72014c783e5698beb18ee1249597e510b8bcb5a.zip cpython-b72014c783e5698beb18ee1249597e510b8bcb5a.tar.gz cpython-b72014c783e5698beb18ee1249597e510b8bcb5a.tar.bz2 | |
GH-99729: Unlink frames before clearing them (GH-100030)
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 80bfa21..9e4179e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1009,14 +1009,6 @@ trace_function_exit(PyThreadState *tstate, _PyInterpreterFrame *frame, PyObject return 0; } -static _PyInterpreterFrame * -pop_frame(PyThreadState *tstate, _PyInterpreterFrame *frame) -{ - _PyInterpreterFrame *prev_frame = frame->previous; - _PyEvalFrameClearAndPop(tstate, frame); - return prev_frame; -} - int _Py_CheckRecursiveCallPy( PyThreadState *tstate) @@ -1432,7 +1424,10 @@ exit_unwind: assert(_PyErr_Occurred(tstate)); _Py_LeaveRecursiveCallPy(tstate); assert(frame != &entry_frame); - frame = cframe.current_frame = pop_frame(tstate, frame); + // GH-99729: We need to unlink the frame *before* clearing it: + _PyInterpreterFrame *dying = frame; + frame = cframe.current_frame = dying->previous; + _PyEvalFrameClearAndPop(tstate, dying); if (frame == &entry_frame) { /* Restore previous cframe and exit */ tstate->cframe = cframe.previous; |