commit 04aadf23eac51fec2e436c5960c1362bbb7d03de
author Serhiy Storchaka <storchaka@gmail.com> Sun Mar 11 09:30:13 2018 +0200
committer GitHub <noreply@github.com> Sun Mar 11 09:30:13 2018 +0200
tree a956b67022abd2203fe8e1e7cce0604902ed638d
parent 39441fce0218a3f51a80cf17aa179a32651a02f6

[3.7] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (GH-6026). (#6074)

(cherry picked from commit 26c9f565d016db21257a60d29ab2c99383dd5ac7)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 3083e5b..2825041 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -320,6 +320,13 @@
             PyObject *v = (*--f->f_stacktop);
             Py_DECREF(v);
         }
+        if (b->b_type == SETUP_FINALLY &&
+            code[b->b_handler] == WITH_CLEANUP_START)
+        {
+            /* Pop the exit function. */
+            PyObject *v = (*--f->f_stacktop);
+            Py_DECREF(v);
+        }
     }
 
     /* Finally set the new f_lineno and f_lasti and return OK. */