Changeset 112

Timestamp:

08/29/2006 01:11:42 PM (7 years ago)

Author:

moo

Message:

avoid crash when OOM on mem_(calloc|realloc|strndup)

Files:

• branches/1.0/mem.c (modified) (3 diffs)
• trunk/mem.c (modified) (3 diffs)

branches/1.0/mem.c

@@ -242 +242 @@
     void *p = xc_mem_malloc(mem, realsize);
 
-    memset(p, 0, realsize);
+    if (p) {
+        memset(p, 0, realsize);
+    }
     return p;
 }
@@ -249 +251 @@
 {
     void *newp = xc_mem_malloc(mem, size);
-    memcpy(newp, p, size);
-    xc_mem_free(mem, p);
+    if (p) {
+        memcpy(newp, p, size);
+        xc_mem_free(mem, p);
+    }
     return newp;
 }
@@ -257 +261 @@
 {
     void *p = xc_mem_malloc(mem, len + 1);
-    memcpy(p, str, len + 1);
+    if (p) {
+        memcpy(p, str, len + 1);
+    }
     return p;
 }

trunk/mem.c

@@ -242 +242 @@
     void *p = xc_mem_malloc(mem, realsize);
 
-    memset(p, 0, realsize);
+    if (p) {
+        memset(p, 0, realsize);
+    }
     return p;
 }
@@ -249 +251 @@
 {
     void *newp = xc_mem_malloc(mem, size);
-    memcpy(newp, p, size);
-    xc_mem_free(mem, p);
+    if (p) {
+        memcpy(newp, p, size);
+        xc_mem_free(mem, p);
+    }
     return newp;
 }
@@ -257 +261 @@
 {
     void *p = xc_mem_malloc(mem, len + 1);
-    memcpy(p, str, len + 1);
+    if (p) {
+        memcpy(p, str, len + 1);
+    }
     return p;
 }