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
........
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 92f58c2..7a51d24 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -572,6 +572,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 PyString_FromString(p);