mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 87648,87656 via svnmerge from

Browse source 
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:09:41 +00:00
parent ed3baf35c3
commit d4bf48bbb3
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/timemodule.c
View file

@ -643,6 +643,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 PyUnicode_FromString(p);