diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-04-10 21:00:56 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-04-10 21:00:56 (GMT) |
| commit | c9314d9e08309782010b56a41bb2d28c6a556302 (patch) | |
| tree | 6e1b43b68da2da88e5a1bb714848a7fceac5d65f | |
| parent | cd514cf175ef820fe62f7e201f596f930d4b1d02 (diff) | |
| download | cpython-c9314d9e08309782010b56a41bb2d28c6a556302.zip cpython-c9314d9e08309782010b56a41bb2d28c6a556302.tar.gz cpython-c9314d9e08309782010b56a41bb2d28c6a556302.tar.bz2 | |
don't run frame if it has no stack (closes #17669)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/genobject.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -12,6 +12,8 @@ What's New in Python 3.3.2? Core and Builtins ----------------- +- Issue #17669: Fix crash involving finalization of generators using yield from. + - Issue #17619: Make input() check for Ctrl-C correctly on Windows. - Issue #17610: Don't rely on non-standard behavior of the C qsort() function. diff --git a/Objects/genobject.c b/Objects/genobject.c index 597aed3..016bfa2 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -178,7 +178,7 @@ gen_yf(PyGenObject *gen) PyObject *yf = NULL; PyFrameObject *f = gen->gi_frame; - if (f) { + if (f && f->f_stacktop) { PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); |