mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 10:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36851: Clean the frame stack if the execution ends with a return and the stack is not empty (GH-13191)

Browse source
This commit is contained in:
Pablo Galindo 2019-05-09 16:52:02 +01:00 • committed by GitHub
parent 33e067d6a2
commit f00828a742
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/ceval.c
View file

@ -1755,7 +1755,7 @@ main_loop:
case TARGET(RETURN_VALUE): {
retval = POP();
assert(f->f_iblock == 0);
goto return_or_yield;
goto exit_returning;
}
case TARGET(GET_AITER): {
@ -1924,7 +1924,7 @@ main_loop:
/* and repeat... */
assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT));
f->f_lasti -= sizeof(_Py_CODEUNIT);
goto return_or_yield;
goto exit_yielding;
}
case TARGET(YIELD_VALUE): {
@ -1941,7 +1941,7 @@ main_loop:
}
f->f_stacktop = stack_pointer;
goto return_or_yield;
goto exit_yielding;
}
case TARGET(POP_EXCEPT): {
@ -3581,16 +3581,18 @@ exception_unwind:
break;
} /* main loop */
assert(retval == NULL);
assert(PyErr_Occurred());
exit_returning:
/* Pop remaining stack entries. */
while (!EMPTY()) {
PyObject *o = POP();
Py_XDECREF(o);
}
assert(retval == NULL);
assert(PyErr_Occurred());
return_or_yield:
exit_yielding:
if (tstate->use_tracing) {
if (tstate->c_tracefunc) {
if (call_trace_protected(tstate->c_tracefunc, tstate->c_traceobj,