Commit 597696c7 authored by Victor Stinner's avatar Victor Stinner

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

parents b7f1b38d 36577e4e
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment