Issue #14125: backport refleak fix (d4adbf908983).

Stefan Krah · Stefan Krah · commit 2201ecbbfc91 · 2012-02-27T17:34:17.000+01:00
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -504,7 +504,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;
@@ -516,7 +516,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
`@@ -504,7 +504,7 @@ time_strftime(PyObject self, PyObject args)`
`504`	`504`	`fmt = PyBytes_AS_STRING(format);`
`505`	`505`	`#endif`
`506`	`506`
`507`		`-#if defined(MS_WINDOWS)`
	`507`	`+#if defined(MS_WINDOWS) && !defined(HAVE_WCSFTIME)`
`508`	`508`	`/* check that the format string contains only valid directives */`
`509`	`509`	`for(outbuf = strchr(fmt, '%');`
`510`	`510`	`outbuf != NULL;`
`@@ -516,7 +516,8 @@ time_strftime(PyObject self, PyObject args)`
`516`	`516`	`!strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))`
`517`	`517`	`{`
`518`	`518`	`PyErr_SetString(PyExc_ValueError, "Invalid format string");`
`519`		`- return 0;`
	`519`	`+ Py_DECREF(format);`
	`520`	`+ return NULL;`
`520`	`521`	`}`
`521`	`522`	`}`
`522`	`523`	`#endif`