diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-07-17 19:42:45 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-07-17 19:42:45 (GMT) |
| commit | 2ff51b83b88b65818479706f2d5238c52bbae296 (patch) | |
| tree | 625bb314482c9d3a6e656d5df96c86004018d983 /Modules/timemodule.c | |
| parent | 9a146eeadbf7e8a5f93e3ee817364928dba4613b (diff) | |
| download | cpython-2ff51b83b88b65818479706f2d5238c52bbae296.zip cpython-2ff51b83b88b65818479706f2d5238c52bbae296.tar.gz cpython-2ff51b83b88b65818479706f2d5238c52bbae296.tar.bz2 | |
Issue #18408: Fix time.tzset(), detect exception when calling PyInit_timezone()
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 297467f..2c3341c 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -851,6 +851,8 @@ time_tzset(PyObject *self, PyObject *unused) /* Reset timezone, altzone, daylight and tzname */ PyInit_timezone(m); Py_DECREF(m); + if (PyErr_Occurred()) + return NULL; Py_INCREF(Py_None); return Py_None; |