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

(Merge 3.3) Issue #15893: frozenmain.c now handles PyMem_Malloc() failure

This commit is contained in:
Victor Stinner 2013-07-27 01:05:49 +02:00
parent b7f1b38dea 36577e4e8c
commit 597696c70c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Python/frozenmain.c
View File

@ -20,9 +20,16 @@ Py_FrozenMain(int argc, char **argv)
int inspect = 0;
int unbuffered = 0;
char *oldloc;
wchar_t **argv_copy = PyMem_Malloc(sizeof(wchar_t*)*argc);
wchar_t **argv_copy;
/* We need a second copies, as Python might modify the first one. */
wchar_t **argv_copy2 = PyMem_Malloc(sizeof(wchar_t*)*argc);
wchar_t **argv_copy2;
argv_copy = PyMem_Malloc(sizeof(wchar_t*)*argc);
argv_copy2 = PyMem_Malloc(sizeof(wchar_t*)*argc);
if (!argv_copy || !argv_copy2) {
fprintf(stderr, "out of memory\n");
return 1;
}
Py_FrozenFlag = 1; /* Suppress errors from getpath.c */