mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 10:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #15893: Improve error handling in main() and Py_FrozenMain()

Browse source 
* handle _PyMem_RawStrdup() failure
* Py_FrozenMain() releases memory on error
* Py_FrozenMain() duplicates the old locale, as done in main()
This commit is contained in:
Victor Stinner 2013-07-27 02:39:09 +02:00
parent 739cf4e3e6
commit c588feeea9
2 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/python.c
View file

@ -45,6 +45,11 @@ main(int argc, char **argv)
#endif #endif
oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL));
if (!oldloc) {
fprintf(stderr, "out of memory\n");
return 1;
}
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
argv_copy[i] = _Py_char2wchar(argv[i], NULL); argv_copy[i] = _Py_char2wchar(argv[i], NULL);

37
Python/frozenmain.c
View file

@ -16,19 +16,19 @@ int
Py_FrozenMain(int argc, char **argv) Py_FrozenMain(int argc, char **argv)
{ {
char *p; char *p;
int i, n, sts; int i, n, sts = 1;
int inspect = 0; int inspect = 0;
int unbuffered = 0; int unbuffered = 0;
char *oldloc; char *oldloc = NULL;
wchar_t **argv_copy; wchar_t **argv_copy = NULL;
/* We need a second copies, as Python might modify the first one. */ /* 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_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc);
argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*)*argc); argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc);
if (!argv_copy || !argv_copy2) { if (!argv_copy || !argv_copy2) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
return 1; goto error;
} }
Py_FrozenFlag = 1; /* Suppress errors from getpath.c */ Py_FrozenFlag = 1; /* Suppress errors from getpath.c */
@ -44,23 +44,26 @@ Py_FrozenMain(int argc, char **argv)
setbuf(stderr, (char *)NULL); setbuf(stderr, (char *)NULL);
} }
if (!argv_copy) { oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL));
if (!oldloc) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
return 1; goto error;
} }
oldloc = setlocale(LC_ALL, NULL);
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
argv_copy[i] = _Py_char2wchar(argv[i], NULL); argv_copy[i] = _Py_char2wchar(argv[i], NULL);
argv_copy2[i] = argv_copy[i];
if (!argv_copy[i]) { if (!argv_copy[i]) {
fprintf(stderr, "Unable to decode the command line argument #%i\n", fprintf(stderr, "Unable to decode the command line argument #%i\n",
i + 1); i + 1);
return 1; argc = i;
goto error;
} }
argv_copy2[i] = argv_copy[i];
} }
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
PyMem_RawFree(oldloc);
oldloc = NULL;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
PyInitFrozenExtensions(); PyInitFrozenExtensions();
@ -94,10 +97,14 @@ Py_FrozenMain(int argc, char **argv)
PyWinFreeze_ExeTerm(); PyWinFreeze_ExeTerm();
#endif #endif
Py_Finalize(); Py_Finalize();
for (i = 0; i < argc; i++) {
PyMem_RawFree(argv_copy2[i]); error:
}
PyMem_RawFree(argv_copy); PyMem_RawFree(argv_copy);
if (argv_copy2) {
for (i = 0; i < argc; i++)
PyMem_RawFree(argv_copy2[i]);
PyMem_RawFree(argv_copy2); PyMem_RawFree(argv_copy2);
}
PyMem_RawFree(oldloc);
return sts; return sts;
} }