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.
This commit is contained in:
Ronald Oussoren 2012-08-22 14:24:14 +02:00
parent ee253ebf62
commit eb61f8b3a7
2 changed files with 3 additions and 1 deletions

View File

@ -10,6 +10,8 @@ What's New in Python 3.2.4
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.

View File

@ -616,7 +616,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));