Commit 4b9b9364 authored by Nick Coghlan's avatar Nick Coghlan

Don't decref exc too soon

parent c4c2580d
......@@ -2685,7 +2685,6 @@ _PyErr_TrySetFromCause(const char *format, ...)
* state potentially stored on OSError instances.
*/
Py_DECREF(exc);
Py_XDECREF(tb);
#ifdef HAVE_STDARG_PROTOTYPES
......@@ -2696,12 +2695,14 @@ _PyErr_TrySetFromCause(const char *format, ...)
msg_prefix = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (msg_prefix == NULL) {
Py_DECREF(exc);
Py_DECREF(val);
return NULL;
}
PyErr_Format(exc, "%U (%s: %S)",
msg_prefix, Py_TYPE(val)->tp_name, val);
Py_DECREF(exc);
Py_DECREF(msg_prefix);
PyErr_Fetch(&new_exc, &new_val, &new_tb);
PyErr_NormalizeException(&new_exc, &new_val, &new_tb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment