[Python-checkins] r87662 - in python/branches/release31-maint: Lib/test/test_time.py Modules/timemodule.c

Mon Jan 3 00:09:41 CET 2011

Author: alexander.belopolsky
Date: Mon Jan 3 00:09:41 2011
New Revision: 87662
Log:
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 (2011年1月02日) | 1 line
 
 Issue #8013: Fixed time.asctime segfault when OS's asctime fails
........
 r87656 | alexander.belopolsky | 2011年01月02日 17:16:10 -0500 (2011年1月02日) | 1 line
 
 Issue #8013: Fixed test
........
Modified:
 python/branches/release31-maint/Lib/test/test_time.py
 python/branches/release31-maint/Modules/timemodule.c
Modified: python/branches/release31-maint/Lib/test/test_time.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_time.py	(original)
+++ python/branches/release31-maint/Lib/test/test_time.py	Mon Jan 3 00:09:41 2011
@@ -124,6 +124,16 @@
 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
 
 @unittest.skipIf(not hasattr(time, "tzset"),
 "time module has no attribute tzset")
Modified: python/branches/release31-maint/Modules/timemodule.c
==============================================================================
--- python/branches/release31-maint/Modules/timemodule.c	(original)
+++ python/branches/release31-maint/Modules/timemodule.c	Mon Jan 3 00:09:41 2011
@@ -643,6 +643,10 @@
 } 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 PyUnicode_FromString(p);
