[Python-checkins] cpython (merge 3.3 -> default): (Merge 3.3) Issue #15893: frozenmain.c now handles PyMem_Malloc() failure

[victor.stinner]

http://hg.python.org/cpython/rev/386ab2c12301
changeset:   84858:386ab2c12301
parent:      84856:ad90fc28769a
parent:      84857:ab8121466785
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Jul 27 01:05:49 2013 +0200
summary:
  (Merge 3.3) Issue #15893: frozenmain.c now handles PyMem_Malloc() failure

files:
  Python/frozenmain.c |  11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Python/frozenmain.c b/Python/frozenmain.c
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -20,9 +20,16 @@
     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 */
 

-- 
Repository URL: http://hg.python.org/cpython