traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #10653: Fix time.strftime() on Windows, check for invalid format strings

This commit is contained in:
Victor Stinner 2011-10-16 19:08:23 +02:00
parent de49d64dbc
commit 5a3ff79fd6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/timemodule.c
View File

@ -463,16 +463,16 @@ time_strftime(PyObject *self, PyObject *args)
fmt = PyBytes_AS_STRING(format);
#endif
#if defined(MS_WINDOWS) && defined(HAVE_WCSFTIME)
#if defined(MS_WINDOWS)
/* check that the format string contains only valid directives */
for(outbuf = wcschr(fmt, L'%');
for(outbuf = strchr(fmt, '%');
outbuf != NULL;
outbuf = wcschr(outbuf+2, L'%'))
outbuf = strchr(outbuf+2, '%'))
{
if (outbuf[1]=='#')
++outbuf; /* not documented by python, */
if (outbuf[1]=='\0' ||
!wcschr(L"aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
!strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
{
PyErr_SetString(PyExc_ValueError, "Invalid format string");
return 0;