traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #18203: Replace PyMem_Malloc() with PyMem_RawMalloc() at Python initialization

This commit is contained in:
Victor Stinner 2013-07-27 01:13:34 +02:00
parent 597696c70c
commit b5245bec93
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/frozenmain.c
View File

@ -24,8 +24,8 @@ Py_FrozenMain(int argc, char **argv)
/* 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;
argv_copy = PyMem_Malloc(sizeof(wchar_t*)*argc); argv_copy = PyMem_RawMalloc(sizeof(wchar_t*)*argc);
argv_copy2 = PyMem_Malloc(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; return 1;
@ -62,7 +62,7 @@ Py_FrozenMain(int argc, char **argv)
fprintf(stderr, "Could not convert argument %d to string\n", i); fprintf(stderr, "Could not convert argument %d to string\n", i);
return 1; 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]; argv_copy2[i] = argv_copy[i];
if (!argv_copy[i]) { if (!argv_copy[i]) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
@ -109,9 +109,9 @@ Py_FrozenMain(int argc, char **argv)
#endif #endif
Py_Finalize(); Py_Finalize();
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
PyMem_Free(argv_copy2[i]); PyMem_RawFree(argv_copy2[i]);
} }
PyMem_Free(argv_copy); PyMem_RawFree(argv_copy);
PyMem_Free(argv_copy2); PyMem_RawFree(argv_copy2);
return sts; return sts;
} }