Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #3367: NULL-terminate argv[] copies to prevent an invalid access 

in sys_update_path().
This commit is contained in:
Stefan Krah 2012-03-26 15:05:22 +02:00
parent 533281dd4f
commit 0f6ce8d9df
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/python.c
View File

@ -22,9 +22,9 @@ extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*argc); wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*(argc+1));
/* We need a second copies, as Python might modify the first one. */ /* We need a second copies, as Python might modify the first one. */
wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*argc); wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*(argc+1));
int i, res; int i, res;
char *oldloc; char *oldloc;
/* 754 requires that FP exceptions run in "no stop" mode by default, /* 754 requires that FP exceptions run in "no stop" mode by default,
@ -58,6 +58,8 @@ main(int argc, char **argv)
} }
argv_copy2[i] = argv_copy[i]; argv_copy2[i] = argv_copy[i];
} }
argv_copy2[argc] = argv_copy[argc] = NULL;
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
free(oldloc); free(oldloc);
res = Py_Main(argc, argv_copy); res = Py_Main(argc, argv_copy);