traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #1733973 by peaker: 

ptrace_enter_call() assumes no exception is currently set.
This assumption is broken when throwing into a generator.
This commit is contained in:
Armin Rigo 2007-09-06 08:30:51 +00:00
parent 5768d577d3
commit bddc3416f8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/_lsprof.c
View File

@ -369,11 +369,20 @@ ptrace_enter_call(PyObject *self, void *key, PyObject *userObj)
ProfilerEntry *profEntry; ProfilerEntry *profEntry;
ProfilerContext *pContext; ProfilerContext *pContext;
/* In the case of entering a generator expression frame via a
* throw (gen_send_ex(.., 1)), we may already have an
* Exception set here. We must not mess around with this
* exception, and some of the code under here assumes that
* PyErr_* is its own to mess around with, so we have to
* save and restore any current exception. */
PyObject *last_type, *last_value, *last_tb;
PyErr_Fetch(&last_type, &last_value, &last_tb);
profEntry = getEntry(pObj, key); profEntry = getEntry(pObj, key);
if (profEntry == NULL) { if (profEntry == NULL) {
profEntry = newProfilerEntry(pObj, key, userObj); profEntry = newProfilerEntry(pObj, key, userObj);
if (profEntry == NULL) if (profEntry == NULL)
return; goto restorePyerr;
} }
/* grab a ProfilerContext out of the free list */ /* grab a ProfilerContext out of the free list */
pContext = pObj->freelistProfilerContext; pContext = pObj->freelistProfilerContext;
@ -386,10 +395,13 @@ ptrace_enter_call(PyObject *self, void *key, PyObject *userObj)
malloc(sizeof(ProfilerContext)); malloc(sizeof(ProfilerContext));
if (pContext == NULL) { if (pContext == NULL) {
pObj->flags |= POF_NOMEMORY; pObj->flags |= POF_NOMEMORY;
return; goto restorePyerr;
} }
} }
initContext(pObj, pContext, profEntry); initContext(pObj, pContext, profEntry);
restorePyerr:
PyErr_Restore(last_type, last_value, last_tb);
} }
static void static void