Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

If HAVE_DECL_TZNAME, PyInit_timezone() now returns -1 on error.
This commit is contained in:
Victor Stinner 2018-12-03 12:02:43 +01:00 committed by GitHub
parent 4013c17911
commit ab66149693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/timemodule.c
View File

@ -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;