changeset: 75317:b4321f93e3f2
branch: 3.2
parent: 75312:b52fbbcdc8e6
user: Stefan Krah <skrah@bytereef.org>
date: Mon Feb 27 17:34:17 2012 +0100
files: Modules/timemodule.c
description:
Issue #14125: backport refleak fix (d4adbf908983).
diff -r b52fbbcdc8e6 -r b4321f93e3f2 Modules/timemodule.c
--- a/Modules/timemodule.c	Mon Feb 27 11:56:29 2012 +0000
+++ b/Modules/timemodule.c	Mon Feb 27 17:34:17 2012 +0100
@@ -504,7 +504,7 @@
 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 @@
 !strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
 {
 PyErr_SetString(PyExc_ValueError, "Invalid format string");
- return 0;
+ Py_DECREF(format);
+ return NULL;
 }
 }
 #endif
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/b4321f93e3f2">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/b4321f93e3f2" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>