[Python-checkins] cpython (3.2): Fix for issue 15716: interpreter could crash when PYTHONEXECUTABLE was set on

ronald.oussoren python-checkins at python.org
Wed Aug 22 14:40:55 CEST 2012


http://hg.python.org/cpython/rev/526c6262d91f
changeset:   78703:526c6262d91f
branch:      3.2
parent:      78699:019a2390b014
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Wed Aug 22 14:24:14 2012 +0200
summary:
  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.

files:
  Misc/NEWS      |  2 ++
  Modules/main.c |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -616,7 +616,7 @@
        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));

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list