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

serhiy-storchaka · web-flow · commit 04aadf23eac5 · 2018-03-11T09:30:13.000+02:00
(cherry picked from commit 26c9f56) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -797,6 +797,34 @@ def test_jump_across_with(output):
         with tracecontext(output, 4):
             output.append(5)
 
+    @jump_test(4, 5, [1, 3, 5, 6])
+    def test_jump_out_of_with_block_within_for_block(output):
+        output.append(1)
+        for i in [1]:
+            with tracecontext(output, 3):
+                output.append(4)
+            output.append(5)
+        output.append(6)
+
+    @jump_test(4, 5, [1, 2, 3, 5, -2, 6])
+    def test_jump_out_of_with_block_within_with_block(output):
+        output.append(1)
+        with tracecontext(output, 2):
+            with tracecontext(output, 3):
+                output.append(4)
+            output.append(5)
+        output.append(6)
+
+    @jump_test(5, 6, [2, 4, 6, 7])
+    def test_jump_out_of_with_block_within_finally_block(output):
+        try:
+            output.append(2)
+        finally:
+            with tracecontext(output, 4):
+                output.append(5)
+            output.append(6)
+        output.append(7)
+
     @jump_test(8, 11, [1, 3, 5, 11, 12])
     def test_jump_out_of_complex_nested_blocks(output):
         output.append(1)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-03-08-09-48-38.bpo-33026.QZA3Ba.rst b/Misc/NEWS.d/next/Core and Builtins/2018-03-08-09-48-38.bpo-33026.QZA3Ba.rst
@@ -0,0 +1 @@
+Fixed jumping out of "with" block by setting f_lineno.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -320,6 +320,13 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
             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. */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixed jumping out of "with" block by setting f_lineno.`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,13 @@ frame_setlineno(PyFrameObject f, PyObject p_new_lineno)`
`320`	`320`	`PyObject v = (--f->f_stacktop);`
`321`	`321`	`Py_DECREF(v);`
`322`	`322`	`}`
	`323`	`+ if (b->b_type == SETUP_FINALLY &&`
	`324`	`+ code[b->b_handler] == WITH_CLEANUP_START)`
	`325`	`+ {`
	`326`	`+ /* Pop the exit function. */`
	`327`	`+ PyObject v = (--f->f_stacktop);`
	`328`	`+ Py_DECREF(v);`
	`329`	`+ }`
`323`	`330`	`}`
`324`	`331`
`325`	`332`	`/* Finally set the new f_lineno and f_lasti and return OK. */`