[libvirt] [PATCH] Fix leaks in vircapstest

Coverity complains about cell_cpus being leaked on error and valgrind shows 'caps' is leaked on success. Introduced in eb64e87. --- tests/vircapstest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index a40771d..4264e9e 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; -- 1.8.3.2

On 02/12/2014 02:47 AM, Ján Tomko wrote:
Coverity complains about cell_cpus being leaked on error and valgrind shows 'caps' is leaked on success.
Introduced in eb64e87. --- tests/vircapstest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
ACK -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 02/12/2014 02:32 PM, Eric Blake wrote:
On 02/12/2014 02:47 AM, Ján Tomko wrote:
Coverity complains about cell_cpus being leaked on error and valgrind shows 'caps' is leaked on success.
Introduced in eb64e87. --- tests/vircapstest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
ACK
Thank you, now pushed. Jan
participants (2)
-
Eric Blake
-
Ján Tomko