From fb4d6ecd0757c0863b8a2e45a57a6dfec13fbff6 Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Wed, 2 Oct 2002 13:13:45 +0000 Subject: Fix for the recursion_level bug Armin Rigo reported in sf 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 ;-). --- Python/ceval.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Python') diff --git a/Python/ceval.c b/Python/ceval.c index 362cd0bce7..493043303e 100644 --- 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; } } -- cgit v1.2.1