GH-96864: Check for error between line and opcode events (GH-96880)

brandtbucher · web-flow · commit c10e33ac119d · 2022-09-19T14:02:24.000-07:00
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -1721,6 +1721,20 @@ def g(frame, event, arg):
         finally:
             sys.settrace(existing)
 
+    def test_line_event_raises_before_opcode_event(self):
+        exception = ValueError("BOOM!")
+        def trace(frame, event, arg):
+            if event == "line":
+                raise exception
+            frame.f_trace_opcodes = True
+            return trace
+        def f():
+            pass
+        with self.assertRaises(ValueError) as caught:
+            sys.settrace(trace)
+            f()
+        self.assertIs(caught.exception, exception)
+
 
 # 'Jump' tests: assigning to frame.f_lineno within a trace function
 # moves the execution position - it's how debuggers implement a Jump
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-09-16-12-36-13.gh-issue-96864.PLU3i8.rst b/Misc/NEWS.d/next/Core and Builtins/2022-09-16-12-36-13.gh-issue-96864.PLU3i8.rst
@@ -0,0 +1,2 @@
+Fix a possible assertion failure, fatal error, or :exc:`SystemError` if a
+line tracing event raises an exception while opcode tracing is enabled.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -6293,7 +6293,7 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
         }
     }
     /* Always emit an opcode event if we're tracing all opcodes. */
-    if (f->f_trace_opcodes) {
+    if (f->f_trace_opcodes && result == 0) {
         result = call_trace(func, obj, tstate, frame, PyTrace_OPCODE, Py_None);
     }
     return result;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a possible assertion failure, fatal error, or :exc:`SystemError` if a
	`2`	`+line tracing event raises an exception while opcode tracing is enabled.`
Original file line number	Diff line number	Diff line change
`@@ -6293,7 +6293,7 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,`
`6293`	`6293`	`}`
`6294`	`6294`	`}`
`6295`	`6295`	`/* Always emit an opcode event if we're tracing all opcodes. */`
`6296`		`- if (f->f_trace_opcodes) {`
	`6296`	`+ if (f->f_trace_opcodes && result == 0) {`
`6297`	`6297`	`result = call_trace(func, obj, tstate, frame, PyTrace_OPCODE, Py_None);`
`6298`	`6298`	`}`
`6299`	`6299`	`return result;`