changeset: 78704:ae51329f9893
parent: 78702:6ce6707743d9
parent: 78703:526c6262d91f
user: Ronald Oussoren <ronaldoussoren@mac.com>
date: Wed Aug 22 14:40:35 2012 +0200
files: Misc/NEWS Modules/main.c
description:
Fix for issue 15716: interpreter could crash when PYTHONEXECUTABLE was set on Mac OS X.
This is due to an off-by-one error: the allocated buffer didn't have room for a NUL
character at the end of the mbstowcs result.
(merge with 3.2)
diff -r 6ce6707743d9 -r ae51329f9893 Misc/NEWS
--- a/Misc/NEWS	Wed Aug 22 08:38:04 2012 +0300
+++ b/Misc/NEWS	Wed Aug 22 14:40:35 2012 +0200
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X.
+
 - Issue #15726: Fix incorrect bounds checking in PyState_FindModule.
 Patch by Robin Schreiber.
 
diff -r 6ce6707743d9 -r ae51329f9893 Modules/main.c
--- a/Modules/main.c	Wed Aug 22 08:38:04 2012 +0300
+++ b/Modules/main.c	Wed Aug 22 14:40:35 2012 +0200
@@ -604,7 +604,7 @@
 script. */
 if ((p = Py_GETENV("PYTHONEXECUTABLE")) && *p != '0円') {
 wchar_t* buffer;
- size_t len = strlen(p);
+ size_t len = strlen(p) + 1;
 
 buffer = malloc(len * sizeof(wchar_t));
 if (buffer == NULL) {
</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/ae51329f9893">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/ae51329f9893" 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>