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 ;-).
diff --git a/Python/ceval.c b/Python/ceval.c
index 362cd0b..4930433 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -636,6 +636,8 @@
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 @@
tstate->c_profileobj,
f, PyTrace_CALL, Py_None)) {
/* Profile function raised an error */
+ --tstate->recursion_depth;
+ tstate->frame = f->f_back;
return NULL;
}
}