mirror of
https://github.com/python/cpython.git
synced 2025-07-16 07:45:20 +00:00
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 ;-).
This commit is contained in:
parent
3c6d6f2ff7
commit
fb4d6ecd07
2 changed files with 24 additions and 0 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue