From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 22 Aug 2012 12:40:35 +0000 (+0200)
Subject: Fix for issue 15716: interpreter could crash when PYTHONEXECUTABLE was set on Mac... 
X-Git-Tag: v3.3.0rc1~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd9cd3fb996e580733d452d61aa59af01a84d93;p=thirdparty%2FPython%2Fcpython.git

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)
---

9bd9cd3fb996e580733d452d61aa59af01a84d93
diff --cc Modules/main.c
index e86aa77b654a,5d1d8964bfd5..a16ce65cd131
--- a/Modules/main.c
+++ b/Modules/main.c
@@@ -604,7 -616,8 +604,7 @@@ Py_Main(int argc, wchar_t **argv
         script. */
      if ((p = Py_GETENV("PYTHONEXECUTABLE")) && *p != '\0') {
          wchar_t* buffer;
-         size_t len = strlen(p);
+         size_t len = strlen(p) + 1;
 -        size_t r;
  
          buffer = malloc(len * sizeof(wchar_t));
          if (buffer == NULL) {