diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-16 19:08:23 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-16 19:08:23 +0200 |
| commit | c7ce759e9fa82cb67afc72e6a758d67e1373c8a0 (patch) | |
| tree | 84cd5bcec2d1b9a48ad1432a0e12a1ef47ec3b9d /Modules/timemodule.c | |
| parent | de1ed480e61b44036622d16f0dd9edc09a3b2f1a (diff) | |
| download | cpython-c7ce759e9fa82cb67afc72e6a758d67e1373c8a0.tar.gz | |
Issue #10653: Fix time.strftime() on Windows, check for invalid format strings
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index f825c2cd43..b7604b0c49 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -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; |