From e2dc0822941fd81e9db017f85a8475a26c00f952 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Sun, 2 Jan 2011 20:48:22 +0000 Subject: Issue #8013: Fixed time.asctime segfault when OS's asctime fails --- Lib/test/test_time.py | 3 +++ Modules/timemodule.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 600d476..c5e48df 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -122,6 +122,9 @@ class TimeTestCase(unittest.TestCase): def test_asctime(self): time.asctime(time.gmtime(self.t)) self.assertRaises(TypeError, time.asctime, 0) + self.assertRaises(TypeError, time.asctime, ()) + self.assertRaises(ValueError, time.asctime, + (12345, 1, 0, 0, 0, 0, 0, 0, 0)) def test_asctime_bounding_check(self): self._bounds_checking(time.asctime) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 89666a4..e8ea661 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -620,6 +620,10 @@ time_asctime(PyObject *self, PyObject *args) } else if (!gettmarg(tup, &buf) || !checktm(&buf)) return NULL; p = asctime(&buf); + if (p == NULL) { + PyErr_SetString(PyExc_ValueError, "invalid time"); + return NULL; + } if (p[24] == '\n') p[24] = '\0'; return PyUnicode_FromString(p); -- cgit v0.12