[Python-checkins] bpo-35373: Fix PyInit_timezone() if HAVE_DECL_TZNAME is defined (GH-10861)

[Victor Stinner]

https://github.com/python/cpython/commit/ab6614969301b238fcc27f43923a0189a57a2a3c
commit: ab6614969301b238fcc27f43923a0189a57a2a3c
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2018-12-03T12:02:43+01:00
summary:

bpo-35373: Fix PyInit_timezone() if HAVE_DECL_TZNAME is defined (GH-10861)

If HAVE_DECL_TZNAME, PyInit_timezone() now returns -1 on error.

files:
M Modules/timemodule.c

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 188f1e6ef571..61041c90b87e 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1581,16 +1581,17 @@ PyInit_timezone(PyObject *m)
     PyModule_AddIntConstant(m, "daylight", daylight);
     otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape");
     if (otz0 == NULL) {
-        return;
+        return -1;
     }
     otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape");
     if (otz1 == NULL) {
         Py_DECREF(otz0);
-        return;
+        return -1;
     }
     PyObject *tzname_obj = Py_BuildValue("(NN)", otz0, otz1);
-    if (tzname_obj == NULL)
-        return;
+    if (tzname_obj == NULL) {
+        return -1;
+    }
     PyModule_AddObject(m, "tzname", tzname_obj);
 #else // !HAVE_DECL_TZNAME
     static const time_t YEAR = (365 * 24 + 6) * 3600;