Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 125

kvm-83-164.el5_5.9.src.rpm

From 972e50a8bda695d04414808f62362c05e781ab00 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 18 May 2009 14:01:52 -0300
Subject: [PATCH 16/16] Fix qemu_realloc() with size == 0

For qemu_realloc with size == 0 a result of NULL is perfectly fine

Signed-off-by: Kevin Wolf <kwolf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 501729
RH-Upstream-status: applied(qemu/master)
Message-ID: <20090518170152.GL2079@blackpad>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
---
 qemu/qemu-malloc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/qemu/qemu-malloc.c b/qemu/qemu-malloc.c
index e9e49cb..6761857 100644
--- a/qemu/qemu-malloc.c
+++ b/qemu/qemu-malloc.c
@@ -48,7 +48,10 @@ void *qemu_malloc(size_t size)
 
 void *qemu_realloc(void *ptr, size_t size)
 {
-    return oom_check(realloc(ptr, size));
+    if (size)
+        return oom_check(realloc(ptr, size));
+    else
+        return realloc(ptr, size);
 }
 
 void *qemu_mallocz(size_t size)
-- 
1.6.3.rc4.29.g8146