diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-02 20:48:22 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-02 20:48:22 (GMT) |
| commit | e2dc0822941fd81e9db017f85a8475a26c00f952 (patch) | |
| tree | e4cc5bd4078283d9a9fd2df4c416f57095dc1ee8 | |
| parent | ece919eb0fd24bcb6fa095049a163ceb96316043 (diff) | |
| download | cpython-e2dc0822941fd81e9db017f85a8475a26c00f952.zip cpython-e2dc0822941fd81e9db017f85a8475a26c00f952.tar.gz cpython-e2dc0822941fd81e9db017f85a8475a26c00f952.tar.bz2 | |
Issue #8013: Fixed time.asctime segfault when OS's asctime fails
| -rw-r--r-- | Lib/test/test_time.py | 3 | ||||
| -rw-r--r-- | Modules/timemodule.c | 4 |
2 files changed, 7 insertions, 0 deletions
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); |