From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 21 Oct 2016 13:19:59 +0000 (+0300)
Subject: Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().
X-Git-Tag: v3.6.0b3~86^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e373be1bc56f69c5af4124db014447eb394970c;p=python

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

diff --git a/Python/errors.c b/Python/errors.c
index e151cab17c..6cc0c20cd5 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);