]> granicus.if.org Git - python/commitdiff
Fix refleak introduced by 4f730c045f5f (issue #18408) and unveiled by 95eea8624d05...
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 23 Nov 2013 13:05:23 +0000 (14:05 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 23 Nov 2013 13:05:23 +0000 (14:05 +0100)
Python/ceval.c

index ab419dc931188eb1106e31c1a69f9ee8ba4f32bb..82f0651e89975f30616c0019f2bed0d09f2ba763 100644 (file)
@@ -3850,20 +3850,16 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
 {
     PyObject *type, *value, *traceback, *orig_traceback, *arg;
     int err;
-    PyErr_Fetch(&type, &value, &traceback);
+    PyErr_Fetch(&type, &value, &orig_traceback);
     if (value == NULL) {
         value = Py_None;
         Py_INCREF(value);
     }
-    PyErr_NormalizeException(&type, &value, &traceback);
-    orig_traceback = traceback;
-    if (traceback == NULL) {
-        Py_INCREF(Py_None);
-        traceback = Py_None;
-    }
+    PyErr_NormalizeException(&type, &value, &orig_traceback);
+    traceback = (orig_traceback != NULL) ? orig_traceback : Py_None;
     arg = PyTuple_Pack(3, type, value, traceback);
     if (arg == NULL) {
-        PyErr_Restore(type, value, traceback);
+        PyErr_Restore(type, value, orig_traceback);
         return;
     }
     err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);