From: malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 28 Jan 2009 17:16:56 +0000 (+0000)
Subject: Fix qemu_malloc.
X-Git-Tag: xen-3.4.0-rc2~69^2~53
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=baa8c602295b1d33844503ce0a172b85f84646d3;p=qemu-xen-3.4-testing.git

Fix qemu_malloc.

make {linux,bsd}-user qemu_realloc handle ptr == NULL correctly.
spotted by malc.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6466 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 66233abc..e916a654 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -127,6 +127,8 @@ void *qemu_realloc(void *ptr, size_t size)
     size_t old_size, copy;
     void *new_ptr;
 
+    if (!ptr)
+        return qemu_malloc(size);
     old_size = *(size_t *)((char *)ptr - 16);
     copy = old_size < size ? old_size : size;
     new_ptr = qemu_malloc(size);
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index d0fc3e3d..888b4914 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -128,6 +128,8 @@ void *qemu_realloc(void *ptr, size_t size)
     size_t old_size, copy;
     void *new_ptr;
 
+    if (!ptr)
+        return qemu_malloc(size);
     old_size = *(size_t *)((char *)ptr - 16);
     copy = old_size < size ? old_size : size;
     new_ptr = qemu_malloc(size);