From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 10 Apr 2013 21:00:56 +0000 (-0400)
Subject: don't run frame if it has no stack (closes #17669)
X-Git-Tag: v3.3.2~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9314d9e08309782010b56a41bb2d28c6a556302;p=thirdparty%2FPython%2Fcpython.git

don't run frame if it has no stack (closes #17669)
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 826ad8586099..05414e365a7a 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 597aed37a116..016bfa297522 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);