diff options
Diffstat (limited to 'Python/frozenmain.c')
| -rw-r--r-- | Python/frozenmain.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Python/frozenmain.c b/Python/frozenmain.c index f08caf23b9..8b1f2d4bbe 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -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 */ @@ -37,11 +44,6 @@ Py_FrozenMain(int argc, char **argv) setbuf(stderr, (char *)NULL); } - if (!argv_copy) { - fprintf(stderr, "out of memory\n"); - return 1; - } - oldloc = setlocale(LC_ALL, NULL); setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { |