Fix virRealloc bug for zero-size

diff --git a/ChangeLog b/ChangeLog
index 1f0d26530bb8760dc366567ec7774a5f7f15e434..9ccac94ddfcf0c101c36d7f94c0cb0eb0fa94f38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 10 19:16:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/memory.c: If size*count== 0, then virRelloc must not
+       return a failure, it is same as virFree.
+
 Fri Oct 10 17:51:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * docs/libvirt.rng: Document SDL attributes in schema

diff --git a/src/memory.c b/src/memory.c
index 93f403fbfe7cda016d37eff4d971c8b39fb51230..31ecd493a74bb12da77f8b3b10e4b9a2985ce3d8 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -158,7 +158,7 @@ int __virReallocN(void *ptrptr, size_t size, size_t count)
         return -1;
     }
     tmp = realloc(*(void**)ptrptr, size * count);
-    if (!tmp)
+    if (!tmp && (size * count))
         return -1;
     *(void**)ptrptr = tmp;
     return 0;