diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-07-03 18:44:00 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-07-03 18:44:00 (GMT) |
| commit | 83195c3f0cffc571e265ca7e42cbbe1f27c792e1 (patch) | |
| tree | 715fce3d966235a79e37a059c7060a2814e62e6b /Python/ceval.c | |
| parent | c77eccd608a8a7d74980b2257a2d2721435f7415 (diff) | |
| download | cpython-83195c3f0cffc571e265ca7e42cbbe1f27c792e1.zip cpython-83195c3f0cffc571e265ca7e42cbbe1f27c792e1.tar.gz cpython-83195c3f0cffc571e265ca7e42cbbe1f27c792e1.tar.bz2 | |
restore a generator's caller's exception state both on yield and (last) return
This prevents generator exception state from leaking into the caller.
Closes #12475.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 705ed41..c0f2874 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1881,10 +1881,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) retval = POP(); f->f_stacktop = stack_pointer; why = WHY_YIELD; - /* Put aside the current exception state and restore - that of the calling frame. This only serves when - "yield" is used inside an except handler. */ - SWAP_EXC_STATE(); goto fast_yield; TARGET(POP_EXCEPT) @@ -3021,6 +3017,11 @@ fast_block_end: retval = NULL; fast_yield: + if (co->co_flags & CO_GENERATOR && (why == WHY_YIELD || why == WHY_RETURN)) + /* Put aside the current exception state and restore that of the + calling frame. */ + SWAP_EXC_STATE(); + if (tstate->use_tracing) { if (tstate->c_tracefunc) { if (why == WHY_RETURN || why == WHY_YIELD) { |