summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-05-01 09:06:36 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-05-01 09:06:36 +0300
commit9422603128b8bca9c0cf501d83715518fcb7e634 (patch)
treee6d1664060a005344d7ca2f159c74127006543e5 /Python/errors.c
parent383eb2c8efcd3963e2660384a9a57f4ba1e051b3 (diff)
downloadcpython-9422603128b8bca9c0cf501d83715518fcb7e634.tar.gz
Issue #23960: Cleanup args and kwargs on error in PyErr_SetImportError
Patch by Ofer Schwarz.
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 47d7c4b992..e151cab17c 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -727,9 +727,9 @@ 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) {
@@ -737,9 +737,9 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
Py_DECREF(error);
}
+done:
Py_DECREF(args);
Py_DECREF(kwargs);
-
return NULL;
}