Visitar URL original
GH-93252: Fix error handling for failed Python calls by brandtbucher · Pull Request #94693 · python/cpython · GitHub
Skip to content

GH-93252: Fix error handling for failed Python calls #94693

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.

Sign up for GitHub

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

Merged
brandtbucher merged 4 commits into from
Jul 9, 2022
Merged

GH-93252: Fix error handling for failed Python calls #94693

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0b41d1
Add failing regression test
brandtbucher Jul 8, 2022
e21751f
Always pop the new frame after a failed call
brandtbucher Jul 8, 2022
eb6f8c4
blurb add
brandtbucher Jul 8, 2022
5b46418
Fix compiler warning
brandtbucher Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix compiler warning
  • Loading branch information
@brandtbucher
brandtbucher committed Jul 8, 2022
commit 5b46418fed959b72eda94ad7ada6485ba553b899
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6432,10 +6432,10 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
static void
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
{
PyObject **base = (PyObject **)frame;
// Make sure that this is, indeed, the top frame. We can't check this in
// _PyThreadState_PopFrame, since f_code is already cleared at that point:
assert(base + frame->f_code->co_framesize == tstate->datastack_top);
assert((PyObject **)frame + frame->f_code->co_framesize ==
tstate->datastack_top);
tstate->recursion_remaining--;
assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
assert(frame->owner == FRAME_OWNED_BY_THREAD);
Expand Down