From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 27 Feb 2012 16:34:17 +0000 (+0100)
Subject: Issue #14125: backport refleak fix (d4adbf908983).
X-Git-Tag: v3.3.0a1~43^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2201ecbbfc9157c91242635c42fa47da15e8d0f8;p=thirdparty%2FPython%2Fcpython.git

Issue #14125: backport refleak fix (d4adbf908983).
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 3ab6e9b84560..626db3e251f6 100644
--- 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