From b5245bec936d22fddb6d14bd130218ac71ed8474 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
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(-)
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index 98f46eb..3b64a6a 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 v0.12