Issue #14125: Fix refleak in timemodule.c on Windows. Thanks sbt for pointing

Stefan Krah · Stefan Krah · commit 4aea7d381197 · 2012-02-27T16:30:26.000+01:00
out the location of the problem. MS_WINDOWS currently implies !HAVE_WCSFTIME,
so the addition of !defined(HAVE_WCSFTIME) is for readability.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -540,7 +540,7 @@ time_strftime(PyObject *self, PyObject *args)
     fmt = PyBytes_AS_STRING(format);
 #endif
 
-#if defined(MS_WINDOWS)
+#if defined(MS_WINDOWS) && !defined(HAVE_WCSFTIME)
     /* check that the format string contains only valid directives */
     for(outbuf = strchr(fmt, '%');
         outbuf != NULL;
@@ -552,7 +552,8 @@ time_strftime(PyObject *self, PyObject *args)
             !strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
         {
             PyErr_SetString(PyExc_ValueError, "Invalid format string");
-            return 0;
+            Py_DECREF(format);
+            return NULL;
         }
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ time_strftime(PyObject self, PyObject args)`
`540`	`540`	`fmt = PyBytes_AS_STRING(format);`
`541`	`541`	`#endif`
`542`	`542`
`543`		`-#if defined(MS_WINDOWS)`
	`543`	`+#if defined(MS_WINDOWS) && !defined(HAVE_WCSFTIME)`
`544`	`544`	`/* check that the format string contains only valid directives */`
`545`	`545`	`for(outbuf = strchr(fmt, '%');`
`546`	`546`	`outbuf != NULL;`
`@@ -552,7 +552,8 @@ time_strftime(PyObject self, PyObject args)`
`552`	`552`	`!strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))`
`553`	`553`	`{`
`554`	`554`	`PyErr_SetString(PyExc_ValueError, "Invalid format string");`
`555`		`- return 0;`
	`555`	`+ Py_DECREF(format);`
	`556`	`+ return NULL;`
`556`	`557`	`}`
`557`	`558`	`}`
`558`	`559`	`#endif`