commit 77b286b2ccccc407d8ed17b0543b10f7c1ccc864
author Nick Coghlan <ncoghlan@gmail.com> Mon Jan 27 00:53:38 2014 +1000
committer Nick Coghlan <ncoghlan@gmail.com> Mon Jan 27 00:53:38 2014 +1000
tree 2e95a1c03b79829ebf72698d61da997f501ef1a5
parent 23e37aa7b787fd41623c4f3f1eb7ca16ded2ef96

Close #20105: set __traceback__ when chaining exceptions in C

Objects/exceptions.c

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index bff7f08..2531ead 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -2689,8 +2689,11 @@
      * types as well, but that's quite a bit trickier due to the extra
      * state potentially stored on OSError instances.
      */
-
-    Py_XDECREF(tb);
+    /* Ensure the traceback is set correctly on the existing exception */
+    if (tb != NULL) {
+        PyException_SetTraceback(val, tb);
+        Py_DECREF(tb);
+    }
 
 #ifdef HAVE_STDARG_PROTOTYPES
     va_start(vargs, format);