From c9314d9e08309782010b56a41bb2d28c6a556302 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 10 Apr 2013 17:00:56 -0400 Subject: don't run frame if it has no stack (closes #17669) --- Misc/NEWS | 2 ++ Objects/genobject.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 826ad85..05414e3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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); -- cgit v0.12