From 9e373be1bc56f69c5af4124db014447eb394970c Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 21 Oct 2016 16:19:59 +0300 Subject: Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions(). --- Python/errors.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Python/errors.c b/Python/errors.c index e151cab..6cc0c20 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -388,8 +388,11 @@ _PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb) PyObject *exc2, *val2, *tb2; PyErr_Fetch(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc, &val, &tb); + if (tb != NULL) { + PyException_SetTraceback(val, tb); + Py_DECREF(tb); + } Py_DECREF(exc); - Py_XDECREF(tb); PyErr_NormalizeException(&exc2, &val2, &tb2); PyException_SetContext(val2, val); PyErr_Restore(exc2, val2, tb2); -- cgit v0.12