From 36577e4e8cf967083dea762407ba9d9d28de5b8a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 27 Jul 2013 01:04:56 +0200 Subject: Issue #15893: frozenmain.c now handles PyMem_Malloc() failure --- Python/frozenmain.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Python') diff --git a/Python/frozenmain.c b/Python/frozenmain.c index f08caf23b9..98f46ebdb2 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 */ -- cgit v1.2.1