Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().

This commit is contained in:
Serhiy Storchaka 2016-10-21 16:20:43 +03:00
commit b0426cd8c4

View file

@ -387,8 +387,11 @@ _PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb)
PyObject *exc2, *val2, *tb2; PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2); PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb); PyErr_NormalizeException(&exc, &val, &tb);
if (tb != NULL) {
PyException_SetTraceback(val, tb);
Py_DECREF(tb);
}
Py_DECREF(exc); Py_DECREF(exc);
Py_XDECREF(tb);
PyErr_NormalizeException(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc2, &val2, &tb2);
PyException_SetContext(val2, val); PyException_SetContext(val2, val);
PyErr_Restore(exc2, val2, tb2); PyErr_Restore(exc2, val2, tb2);