Update version to 0.15.0

[qemu.git] / qemu-malloc.c

diff --git a/qemu-malloc.c b/qemu-malloc.c
index 5e9f47f518cb343707c26bb6339e90d0fa604dee..b9b38514ac1ebb0cbb24d208da0c3c15d021c6a7 100644 (file)
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -22,48 +22,54 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include "trace.h"
 #include <stdlib.h>
 
-static void *oom_check(void *ptr)
-{
-    if (ptr == NULL)
-        abort();
-    return ptr;
-}
-
-void *get_mmap_addr(unsigned long size)
+void qemu_free(void *ptr)
 {
-    return NULL;
+    trace_qemu_free(ptr);
+    free(ptr);
 }
 
-void qemu_free(void *ptr)
+static int allow_zero_malloc(void)
 {
-    free(ptr);
+#if defined(CONFIG_ZERO_MALLOC)
+    return 1;
+#else
+    return 0;
+#endif
 }
 
 void *qemu_malloc(size_t size)
 {
-    if (!size)
+    void *ptr;
+    if (!size && !allow_zero_malloc()) {
         abort();
-    return oom_check(malloc(size));
+    }
+    ptr = qemu_oom_check(malloc(size ? size : 1));
+    trace_qemu_malloc(size, ptr);
+    return ptr;
 }
 
 void *qemu_realloc(void *ptr, size_t size)
 {
-    if (size)
-        return oom_check(realloc(ptr, size));
-    else {
-        if (ptr)
-            return realloc(ptr, size);
+    void *newptr;
+    if (!size && !allow_zero_malloc()) {
+        abort();
     }
-    abort();
+    newptr = qemu_oom_check(realloc(ptr, size ? size : 1));
+    trace_qemu_realloc(ptr, size, newptr);
+    return newptr;
 }
 
 void *qemu_mallocz(size_t size)
 {
     void *ptr;
-    ptr = qemu_malloc(size);
-    memset(ptr, 0, size);
+    if (!size && !allow_zero_malloc()) {
+        abort();
+    }
+    ptr = qemu_oom_check(calloc(1, size ? size : 1));
+    trace_qemu_malloc(size, ptr);
     return ptr;
 }
 
@@ -81,8 +87,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;