From ac17917c5b1372295022cf8f0605d00849743376 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 27 Jul 2013 01:13:34 +0200 Subject: Issue #18203: Replace PyMem_Malloc() with PyMem_RawMalloc() at Python initialization --- Python/frozenmain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Python/frozenmain.c') diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 98f46ebdb2..3b64a6a884 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -24,8 +24,8 @@ Py_FrozenMain(int argc, char **argv) /* We need a second copies, as Python might modify the first one. */ wchar_t **argv_copy2; - argv_copy = PyMem_Malloc(sizeof(wchar_t*)*argc); - argv_copy2 = PyMem_Malloc(sizeof(wchar_t*)*argc); + argv_copy = PyMem_RawMalloc(sizeof(wchar_t*)*argc); + argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*)*argc); if (!argv_copy || !argv_copy2) { fprintf(stderr, "out of memory\n"); return 1; @@ -62,7 +62,7 @@ Py_FrozenMain(int argc, char **argv) fprintf(stderr, "Could not convert argument %d to string\n", i); return 1; } - argv_copy[i] = PyMem_Malloc((argsize+1)*sizeof(wchar_t)); + argv_copy[i] = PyMem_RawMalloc((argsize+1)*sizeof(wchar_t)); argv_copy2[i] = argv_copy[i]; if (!argv_copy[i]) { fprintf(stderr, "out of memory\n"); @@ -109,9 +109,9 @@ Py_FrozenMain(int argc, char **argv) #endif Py_Finalize(); for (i = 0; i < argc; i++) { - PyMem_Free(argv_copy2[i]); + PyMem_RawFree(argv_copy2[i]); } - PyMem_Free(argv_copy); - PyMem_Free(argv_copy2); + PyMem_RawFree(argv_copy); + PyMem_RawFree(argv_copy2); return sts; } -- cgit v1.2.1 From 8ed23a1ff82240bcd7dec5fecf187b53152ee055 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 27 Jul 2013 02:24:52 +0200 Subject: Py_FrozenMain() now uses _Py_char2wchar() to decode command line arguments, as done in main() --- Python/frozenmain.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'Python/frozenmain.c') diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 3b64a6a884..f628ddc846 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -52,27 +52,13 @@ Py_FrozenMain(int argc, char **argv) oldloc = setlocale(LC_ALL, NULL); setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { -#ifdef HAVE_BROKEN_MBSTOWCS - size_t argsize = strlen(argv[i]); -#else - size_t argsize = mbstowcs(NULL, argv[i], 0); -#endif - size_t count; - if (argsize == (size_t)-1) { - fprintf(stderr, "Could not convert argument %d to string\n", i); - return 1; - } - argv_copy[i] = PyMem_RawMalloc((argsize+1)*sizeof(wchar_t)); - argv_copy2[i] = argv_copy[i]; + argv_copy[i] = _Py_char2wchar(argv[i], NULL); if (!argv_copy[i]) { - fprintf(stderr, "out of memory\n"); - return 1; - } - count = mbstowcs(argv_copy[i], argv[i], argsize+1); - if (count == (size_t)-1) { - fprintf(stderr, "Could not convert argument %d to string\n", i); + fprintf(stderr, "Unable to decode the command line argument #%i\n", + i + 1); return 1; } + argv_copy2[i] = argv_copy[i]; } setlocale(LC_ALL, oldloc); -- cgit v1.2.1 From 48fc2996a0dea05d661ac08d3abd00a9097c9851 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 27 Jul 2013 02:39:09 +0200 Subject: Issue #15893: Improve error handling in main() and Py_FrozenMain() * handle _PyMem_RawStrdup() failure * Py_FrozenMain() releases memory on error * Py_FrozenMain() duplicates the old locale, as done in main() --- Python/frozenmain.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'Python/frozenmain.c') diff --git a/Python/frozenmain.c b/Python/frozenmain.c index f628ddc846..55d05fc26f 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -16,19 +16,19 @@ int Py_FrozenMain(int argc, char **argv) { char *p; - int i, n, sts; + int i, n, sts = 1; int inspect = 0; int unbuffered = 0; - char *oldloc; - wchar_t **argv_copy; + char *oldloc = NULL; + wchar_t **argv_copy = NULL; /* We need a second copies, as Python might modify the first one. */ - wchar_t **argv_copy2; + wchar_t **argv_copy2 = NULL; - argv_copy = PyMem_RawMalloc(sizeof(wchar_t*)*argc); - argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*)*argc); + argv_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc); + argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc); if (!argv_copy || !argv_copy2) { fprintf(stderr, "out of memory\n"); - return 1; + goto error; } Py_FrozenFlag = 1; /* Suppress errors from getpath.c */ @@ -44,23 +44,26 @@ Py_FrozenMain(int argc, char **argv) setbuf(stderr, (char *)NULL); } - if (!argv_copy) { + oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); + if (!oldloc) { fprintf(stderr, "out of memory\n"); - return 1; + goto error; } - oldloc = setlocale(LC_ALL, NULL); setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { argv_copy[i] = _Py_char2wchar(argv[i], NULL); + argv_copy2[i] = argv_copy[i]; if (!argv_copy[i]) { fprintf(stderr, "Unable to decode the command line argument #%i\n", i + 1); - return 1; + argc = i; + goto error; } - argv_copy2[i] = argv_copy[i]; } setlocale(LC_ALL, oldloc); + PyMem_RawFree(oldloc); + oldloc = NULL; #ifdef MS_WINDOWS PyInitFrozenExtensions(); @@ -94,10 +97,14 @@ Py_FrozenMain(int argc, char **argv) PyWinFreeze_ExeTerm(); #endif Py_Finalize(); - for (i = 0; i < argc; i++) { - PyMem_RawFree(argv_copy2[i]); - } + +error: PyMem_RawFree(argv_copy); - PyMem_RawFree(argv_copy2); + if (argv_copy2) { + for (i = 0; i < argc; i++) + PyMem_RawFree(argv_copy2[i]); + PyMem_RawFree(argv_copy2); + } + PyMem_RawFree(oldloc); return sts; } -- cgit v1.2.1