From 5a3ff79fd6b885726a1c7d999975ff1ecb35225c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 16 Oct 2011 19:08:23 +0200 Subject: [PATCH] Issue #10653: Fix time.strftime() on Windows, check for invalid format strings --- Modules/timemodule.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index f825c2cd436..b7604b0c496 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;