From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 12 Feb 2014 09:29:18 +0000 (+0100)
Subject: Fix leaks in vircapstest
X-Git-Tag: v1.2.2-rc1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0dc11db8f5626d670bcc42ae6147fd095c5cee;p=thirdparty%2Flibvirt.git

Fix leaks in vircapstest

Coverity complains about cell_cpus being leaked on error
and valgrind shows 'caps' is leaked on success.

Introduced in eb64e87.
---

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index a40771d7cf..4264e9e27c 100644
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -40,7 +40,7 @@ static virCapsPtr
 buildNUMATopology(int seq)
 {
     virCapsPtr caps;
-    virCapsHostNUMACellCPUPtr cell_cpus;
+    virCapsHostNUMACellCPUPtr cell_cpus = NULL;
     int core_id, cell_id;
     int id;
 
@@ -75,6 +75,8 @@ buildNUMATopology(int seq)
     return caps;
 
 error:
+    virCapabilitiesClearHostNUMACellCPUTopology(cell_cpus, MAX_CPUS_IN_CELL);
+    VIR_FREE(cell_cpus);
     virObjectUnref(caps);
     return NULL;
 
@@ -87,7 +89,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED)
     const char *nodestr = "3,4,5,6";
     virBitmapPtr nodemask = NULL;
     virBitmapPtr cpumap = NULL;
-    virCapsPtr caps;
+    virCapsPtr caps = NULL;
     int mask_size = 8;
     int ret = -1;
 
@@ -107,6 +109,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED)
     ret = 0;
 
 error:
+    virObjectUnref(caps);
     virBitmapFree(nodemask);
     virBitmapFree(cpumap);
     return ret;