From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 25 Sep 2013 14:35:44 +0000 (+0100)
Subject: Avoid crash on OOM in virportallocatortest
X-Git-Tag: v1.1.3-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e67ed4215f81294507b22559d35550cb11cafb1;p=thirdparty%2Flibvirt.git

Avoid crash on OOM in virportallocatortest

The virportallocatortest did not check if the object
allocation failed in all cases. This lead to a crash
on OOM in the testsuite

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 1a0cdfafd7..615fa15d05 100644
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -67,6 +67,9 @@ static int testAllocAll(const void *args ATTRIBUTE_UNUSED)
     int ret = -1;
     unsigned short p1, p2, p3, p4, p5, p6, p7;
 
+    if (!alloc)
+        return -1;
+
     if (virPortAllocatorAcquire(alloc, &p1) < 0)
         goto cleanup;
     if (p1 != 5901) {
@@ -137,6 +140,9 @@ static int testAllocReuse(const void *args ATTRIBUTE_UNUSED)
     int ret = -1;
     unsigned short p1, p2, p3, p4;
 
+    if (!alloc)
+        return -1;
+
     if (virPortAllocatorAcquire(alloc, &p1) < 0)
         goto cleanup;
     if (p1 != 5901) {