Fix for the recursion_level bug Armin Rigo reported in sf

Michael W. Hudson · Michael W. Hudson · commit fb4d6ecd0757 · 2002-10-02T13:13:45.000Z
patch #617312, both on the trunk and the 22-maint branch.

Also added a test case, and ported the test_trace I wrote for HEAD
to 2.2.2 (with all those horrible extra 'line' events ;-).
diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
@@ -177,8 +177,28 @@ def test_8_settrace_and_return(self):
     def test_9_settrace_and_raise(self):
         self.run_test2(settrace_and_raise)
 
+class RaisingTraceFuncTestCase(unittest.TestCase):
+    def test_it(self):
+        def tr(frame, event, arg):
+            raise ValueError # just something that isn't RuntimeError
+        def f():
+            return 1
+        try:
+            for i in xrange(sys.getrecursionlimit() + 1):
+                sys.settrace(tr)
+                try:
+                    f()
+                except ValueError:
+                    pass
+                else:
+                    self.fail("exception not thrown!")
+        except RuntimeError:
+            self.fail("recursion counter not reset")
+            
+
 def test_main():
     test_support.run_unittest(TraceTestCase)
+    test_support.run_unittest(RaisingTraceFuncTestCase)
 
 if __name__ == "__main__":
     test_main()
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -636,6 +636,8 @@ eval_frame(PyFrameObject *f)
 			if (call_trace(tstate->c_tracefunc, tstate->c_traceobj,
 				       f, PyTrace_CALL, Py_None)) {
 				/* Trace function raised an error */
+				--tstate->recursion_depth;
+				tstate->frame = f->f_back;
 				return NULL;
 			}
 		}
@@ -646,6 +648,8 @@ eval_frame(PyFrameObject *f)
 				       tstate->c_profileobj,
 				       f, PyTrace_CALL, Py_None)) {
 				/* Profile function raised an error */
+				--tstate->recursion_depth;
+				tstate->frame = f->f_back;
 				return NULL;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,8 @@ eval_frame(PyFrameObject *f)`
`636`	`636`	`if (call_trace(tstate->c_tracefunc, tstate->c_traceobj,`
`637`	`637`	`f, PyTrace_CALL, Py_None)) {`
`638`	`638`	`/* Trace function raised an error */`
	`639`	`+ --tstate->recursion_depth;`
	`640`	`+ tstate->frame = f->f_back;`
`639`	`641`	`return NULL;`
`640`	`642`	`}`
`641`	`643`	`}`
`@@ -646,6 +648,8 @@ eval_frame(PyFrameObject *f)`
`646`	`648`	`tstate->c_profileobj,`
`647`	`649`	`f, PyTrace_CALL, Py_None)) {`
`648`	`650`	`/* Profile function raised an error */`
	`651`	`+ --tstate->recursion_depth;`
	`652`	`+ tstate->frame = f->f_back;`
`649`	`653`	`return NULL;`
`650`	`654`	`}`
`651`	`655`	`}`