mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18408: Fix call_exc_trace(): if the traceback is NULL, use None when

Browse source 
building the tuple (type, value, traceback) passed to the callback.

PyTuple_Pack() does crash if an argument is NULL.
This commit is contained in:
Victor Stinner 2013-07-10 13:57:55 +02:00
parent 19361a2046
commit aaa8ed8b84
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/ceval.c
View file

@ -3817,7 +3817,7 @@ prtrace(PyObject *v, char *str)
static void static void
call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f) call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
{ {
PyObject *type, *value, *traceback, *arg; PyObject *type, *value, *traceback, *orig_traceback, *arg;
int err; int err;
PyErr_Fetch(&type, &value, &traceback); PyErr_Fetch(&type, &value, &traceback);
if (value == NULL) { if (value == NULL) {
@ -3825,6 +3825,11 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
Py_INCREF(value); Py_INCREF(value);
} }
PyErr_NormalizeException(&type, &value, &traceback); PyErr_NormalizeException(&type, &value, &traceback);
orig_traceback = traceback;
if (traceback == NULL) {
Py_INCREF(Py_None);
traceback = Py_None;
}
arg = PyTuple_Pack(3, type, value, traceback); arg = PyTuple_Pack(3, type, value, traceback);
if (arg == NULL) { if (arg == NULL) {
PyErr_Restore(type, value, traceback); PyErr_Restore(type, value, traceback);
@ -3833,11 +3838,11 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
err = call_trace(func, self, f, PyTrace_EXCEPTION, arg); err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
Py_DECREF(arg); Py_DECREF(arg);
if (err == 0) if (err == 0)
PyErr_Restore(type, value, traceback); PyErr_Restore(type, value, orig_traceback);
else { else {
Py_XDECREF(type); Py_XDECREF(type);
Py_XDECREF(value); Py_XDECREF(value);
Py_XDECREF(traceback); Py_XDECREF(orig_traceback);
} }
} }