From 41769a7513dd47bf00d88e8ccb32aa3cacef0415 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Sun, 2 Jan 2011 23:26:12 +0000 Subject: [PATCH] Merged revisions 87663 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r87663 | alexander.belopolsky | 2011-01-02 18:23:54 -0500 (Sun, 02 Jan 2011) | 13 lines Merged revisions 87648,87656 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87648 | alexander.belopolsky | 2011-01-02 15:48:22 -0500 (Sun, 02 Jan 2011) | 1 line Issue #8013: Fixed time.asctime segfault when OS's asctime fails ........ r87656 | alexander.belopolsky | 2011-01-02 17:16:10 -0500 (Sun, 02 Jan 2011) | 1 line Issue #8013: Fixed test ........ ................ --- Lib/test/test_time.py | 10 ++++++++++ Modules/timemodule.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index b5155b4f999..d173ae1ca24 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -119,6 +119,16 @@ 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, ()) + # XXX: Posix compiant asctime should refuse to convert + # year > 9999, but Linux implementation does not. + # self.assertRaises(ValueError, time.asctime, + # (12345, 1, 0, 0, 0, 0, 0, 0, 0)) + # XXX: For now, just make sure we don't have a crash: + try: + time.asctime((12345, 1, 0, 0, 0, 0, 0, 0, 0)) + except ValueError: + pass def test_tzset(self): if not hasattr(time, "tzset"): diff --git a/Modules/timemodule.c b/Modules/timemodule.c index d6d4160da38..a59d3f0600a 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -546,6 +546,10 @@ time_asctime(PyObject *self, PyObject *args) } else if (!gettmarg(tup, &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 PyString_FromString(p);