diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-07-27 01:04:56 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-07-27 01:04:56 +0200 |
| commit | bbbd4734657844b03c7e78de83e16983d7806094 (patch) | |
| tree | 87fa3c616b493ec758cadeccd64f0b6d37ab011e /Python/frozenmain.c | |
| parent | da7db911620efbe87a73ed0ea5f2b1e01327505e (diff) | |
| download | cpython-bbbd4734657844b03c7e78de83e16983d7806094.tar.gz | |
Issue #15893: frozenmain.c now handles PyMem_Malloc() failure
Diffstat (limited to 'Python/frozenmain.c')
| -rw-r--r-- | Python/frozenmain.c | 11 |
1 files changed, 9 insertions, 2 deletions
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 */ |