commit 7c018f486dfe8f1246bf476c8eae63cd3f81a40a
author nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jul 17 16:40:50 2004 +0000
committer nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jul 17 16:40:50 2004 +0000
tree faeacb48e16fcd9c0150275cec2f015481125ac9
parent ac0692a84b5ce6d299146363d469a6298b514d4c

Add a bunch of asserts to check the results of calls to system malloc().

Assertions are arguably not the right thing here, but the practice is
widespread and we're not planning on making asserts optional, and it's a lot
better than no checking.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2499 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_main.c

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 53afa33..e2a15e4 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -653,6 +653,7 @@
       from    = vg_argv;
       vg_argv = malloc( (vg_argc + env_arg_count + f1_arg_count 
                           + f2_arg_count + 2) * sizeof(char **));
+      vg_assert(vg_argv);
       to      = vg_argv;
 
       /* copy argv[0] */
@@ -711,6 +712,7 @@
 	    vg_argc++;
 
       vg_argv = malloc(sizeof(char **) * (vg_argc + 1));
+      vg_assert(vg_argv);
 
       cpp = vg_argv;
 
@@ -842,6 +844,7 @@
       library */
    inject_path_len = sizeof(inject_so) + vgliblen + preloadlen + 16;
    inject_path = malloc(inject_path_len);
+   vg_assert(inject_path);
 
    if (preload)
       snprintf(inject_path, inject_path_len, "%s/%s:%s", 
@@ -857,6 +860,7 @@
 
    /* Allocate a new space */
    ret = malloc(sizeof(char *) * (envc+3+1)); /* 3 new entries + NULL */
+   vg_assert(ret);
 
    /* copy it over */
    for (cpp = ret; *origenv; )
@@ -875,6 +879,7 @@
          if (!scan_colsep(*cpp + ld_library_path_len, contains)) {
 	    int len = strlen(*cpp) + vgliblen*2 + 16;
 	    char *cp = malloc(len);
+            vg_assert(cp);
 
 	    snprintf(cp, len, "%s%s:%s",
 		     ld_library_path, VG_(libdir),
@@ -887,6 +892,7 @@
       } else if (memcmp(*cpp, ld_preload, ld_preload_len) == 0) {
 	 int len = strlen(*cpp) + inject_path_len;
 	 char *cp = malloc(len);
+         vg_assert(cp);
 
 	 snprintf(cp, len, "%s%s:%s",
 		  ld_preload, inject_path, (*cpp)+ld_preload_len);
@@ -904,6 +910,7 @@
    if (!ld_library_path_done) {
       int len = ld_library_path_len + vgliblen*2 + 16;
       char *cp = malloc(len);
+      vg_assert(cp);
 
       snprintf(cp, len, "%s%s", ld_library_path, VG_(libdir));
 
@@ -913,6 +920,7 @@
    if (!ld_preload_done) {
       int len = ld_preload_len + inject_path_len;
       char *cp = malloc(len);
+      vg_assert(cp);
       
       snprintf(cp, len, "%s%s",
 	       ld_preload, inject_path);