Get bsd-user host page protection code working on FreeBSD hosts

[qemu.git] / qemu-malloc.c

diff --git a/qemu-malloc.c b/qemu-malloc.c
index 295d1856efa235ef6a08e2bee43f016aa77406a6..6cdc5deb788aecf955bd3fdb7806b9ffb95ad1e5 100644 (file)
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -42,24 +42,29 @@ void qemu_free(void *ptr)
     free(ptr);
 }
 
+static int allow_zero_malloc(void)
+{
+#if defined(CONFIG_ZERO_MALLOC)
+    return 1;
+#else
+    return 0;
+#endif
+}
+
 void *qemu_malloc(size_t size)
 {
-    if (!size) {
+    if (!size && !allow_zero_malloc()) {
         abort();
     }
-    return oom_check(malloc(size));
+    return oom_check(malloc(size ? size : 1));
 }
 
 void *qemu_realloc(void *ptr, size_t size)
 {
-    if (size) {
-        return oom_check(realloc(ptr, size));
-    } else {
-        if (ptr) {
-            return realloc(ptr, size);
-        }
+    if (!size && !allow_zero_malloc()) {
+        abort();
     }
-    abort();
+    return oom_check(realloc(ptr, size ? size : 1));
 }
 
 void *qemu_mallocz(size_t size)