Issue python#23960: Cleanup args and kwargs on error in PyErr_SetImportError

berkerpeksag · berkerpeksag · commit aa9d36970758 · 2016-05-01T09:06:57.000+03:00
Patch by Ofer Schwarz.
diff --git a/Python/errors.c b/Python/errors.c
@@ -727,19 +727,19 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
     PyTuple_SET_ITEM(args, 0, msg);
 
     if (PyDict_SetItemString(kwargs, "name", name) < 0)
-        return NULL;
+        goto done;
     if (PyDict_SetItemString(kwargs, "path", path) < 0)
-        return NULL;
+        goto done;
 
     error = PyObject_Call(PyExc_ImportError, args, kwargs);
     if (error != NULL) {
         PyErr_SetObject((PyObject *)Py_TYPE(error), error);
         Py_DECREF(error);
     }
 
+done:
     Py_DECREF(args);
     Py_DECREF(kwargs);
-
     return NULL;
 }
 
