Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / qemu-malloc.c

diff --git a/qemu-malloc.c b/qemu-malloc.c
index dc74efe..295d185 100644 (file)
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -22,6 +22,15 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include <stdlib.h>
+
+static void *oom_check(void *ptr)
+{
+    if (ptr == NULL) {
+        abort();
+    }
+    return ptr;
+}
 
 void *get_mmap_addr(unsigned long size)
 {
@@ -35,20 +44,28 @@ void qemu_free(void *ptr)
 
 void *qemu_malloc(size_t size)
 {
-    return malloc(size);
+    if (!size) {
+        abort();
+    }
+    return oom_check(malloc(size));
 }
 
 void *qemu_realloc(void *ptr, size_t size)
 {
-    return realloc(ptr, size);
+    if (size) {
+        return oom_check(realloc(ptr, size));
+    } else {
+        if (ptr) {
+            return realloc(ptr, size);
+        }
+    }
+    abort();
 }
 
 void *qemu_mallocz(size_t size)
 {
     void *ptr;
     ptr = qemu_malloc(size);
-    if (!ptr)
-        return NULL;
     memset(ptr, 0, size);
     return ptr;
 }
@@ -58,8 +75,6 @@ char *qemu_strdup(const char *str)
     char *ptr;
     size_t len = strlen(str);
     ptr = qemu_malloc(len + 1);
-    if (!ptr)
-        return NULL;
     memcpy(ptr, str, len + 1);
     return ptr;
 }
@@ -69,8 +84,9 @@ char *qemu_strndup(const char *str, size_t size)
     const char *end = memchr(str, 0, size);
     char *new;
 
-    if (end)
+    if (end) {
         size = end - str;
+    }
 
     new = qemu_malloc(size + 1);
     new[size] = 0;