diff --git a/ChangeLog b/ChangeLog
index 1f0d26530b..9ccac94ddf 100644
--- 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 93f403fbfe..31ecd493a7 100644
--- 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;