summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Python')
-rw-r--r--Python/_warnings.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 4e22400..2815f79 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1231,25 +1231,29 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
const char *module_str, PyObject *registry)
{
PyObject *message = PyUnicode_FromString(text);
+ if (message == NULL) {
+ return -1;
+ }
PyObject *filename = PyUnicode_DecodeFSDefault(filename_str);
+ if (filename == NULL) {
+ Py_DECREF(message);
+ return -1;
+ }
PyObject *module = NULL;
- int ret = -1;
-
- if (message == NULL || filename == NULL)
- goto exit;
if (module_str != NULL) {
module = PyUnicode_FromString(module_str);
- if (module == NULL)
- goto exit;
+ if (module == NULL) {
+ Py_DECREF(filename);
+ Py_DECREF(message);
+ return -1;
+ }
}
- ret = PyErr_WarnExplicitObject(category, message, filename, lineno,
- module, registry);
-
- exit:
- Py_XDECREF(message);
+ int ret = PyErr_WarnExplicitObject(category, message, filename, lineno,
+ module, registry);
Py_XDECREF(module);
- Py_XDECREF(filename);
+ Py_DECREF(filename);
+ Py_DECREF(message);
return ret;
}