[Qemu-devel] [6466] Fix qemu_malloc.

[malc]

Revision: 6466
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6466
Author:   malc
Date:     2009-01-28 17:16:56 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Fix qemu_malloc.

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

Modified Paths:
--------------
    trunk/bsd-user/mmap.c
    trunk/linux-user/mmap.c

Modified: trunk/bsd-user/mmap.c
===================================================================
--- trunk/bsd-user/mmap.c       2009-01-27 19:15:31 UTC (rev 6465)
+++ trunk/bsd-user/mmap.c       2009-01-28 17:16:56 UTC (rev 6466)
@@ -127,6 +127,8 @@
     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);

Modified: trunk/linux-user/mmap.c
===================================================================
--- trunk/linux-user/mmap.c     2009-01-27 19:15:31 UTC (rev 6465)
+++ trunk/linux-user/mmap.c     2009-01-28 17:16:56 UTC (rev 6466)
@@ -128,6 +128,8 @@
     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);