diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-21 16:19:59 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-21 16:19:59 +0300 |
| commit | 66b6597a5332af38285c91e39d0386179911cb41 (patch) | |
| tree | 7de281e85471d687371eac482231dd72ca0998c0 /Python/errors.c | |
| parent | 842027f322155ce77db74fd1a30d2932c98d478c (diff) | |
| download | cpython-66b6597a5332af38285c91e39d0386179911cb41.tar.gz | |
Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |