commit 3854f5885edc8dc67b1aba82fbb525604fbc625b
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sun Mar 11 00:55:59 2018 -0800
committer Serhiy Storchaka <storchaka@gmail.com> Sun Mar 11 10:55:59 2018 +0200
tree 0a0bbb9d9abf6ef0ba2ffdbfcc4df8be91cd4126
parent 34bb88dc5bc447832db8c7ccdc173311e0685eab

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

(cherry picked from commit 26c9f565d016db21257a60d29ab2c99383dd5ac7)
(cherry picked from commit 04aadf23eac51fec2e436c5960c1362bbb7d03de)

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

Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 2c8fb01..bf1c7c5 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -340,6 +340,11 @@
             PyObject *v = (*--f->f_stacktop);
             Py_DECREF(v);
         }
+        if (b->b_type == SETUP_WITH) {
+            /* Pop the exit function. */
+            PyObject *v = (*--f->f_stacktop);
+            Py_DECREF(v);
+        }
     }
 
     /* Finally set the new f_lineno and f_lasti and return OK. */