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

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
........
This commit is contained in:
Alexander Belopolsky 2011-01-02 23:23:54 +00:00
parent 9e7d6e598c
commit 8009e8e0e2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_time.py
View File

@ -114,6 +114,16 @@ class TimeTestCase(unittest.TestCase):
def test_asctime(self): def test_asctime(self):
time.asctime(time.gmtime(self.t)) time.asctime(time.gmtime(self.t))
self.assertRaises(TypeError, time.asctime, 0) 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
@unittest.skipIf(not hasattr(time, "tzset"), @unittest.skipIf(not hasattr(time, "tzset"),
"time module has no attribute tzset") "time module has no attribute tzset")

4
Modules/timemodule.c
View File

@ -572,6 +572,10 @@ time_asctime(PyObject *self, PyObject *args)
} else if (!gettmarg(tup, &buf)) } else if (!gettmarg(tup, &buf))
return NULL; return NULL;
p = asctime(&buf); p = asctime(&buf);
if (p == NULL) {
PyErr_SetString(PyExc_ValueError, "invalid time");
return NULL;
}
if (p[24] == '\n') if (p[24] == '\n')
p[24] = '\0'; p[24] = '\0';
return PyString_FromString(p); return PyString_FromString(p);