From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 21 Jul 2014 07:53:17 +0000 (+0200)
Subject: examples: domtop: Avoid leaking memory
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ba2b4da02d884acc6ee80057b8675e8e83901be0;p=libvirt.git

examples: domtop: Avoid leaking memory

Use the virTypedParamsFree unconditionally as it handles NULL well and
has the benefit of freeing a typed parameter array even if it wasn't yet
assigned, but only allocated.
---

diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c
index 7661057b12..4ac7889221 100644
--- a/examples/domtop/domtop.c
+++ b/examples/domtop/domtop.c
@@ -334,12 +334,8 @@ do_top(virConnectPtr conn,
 
     ret = 0;
  cleanup:
-    if (max_id > 0) {
-        if (now_nparams > 0)
-            virTypedParamsFree(now_params, now_nparams * max_id);
-        if (then_nparams > 0)
-            virTypedParamsFree(then_params, then_nparams * max_id);
-    }
+    virTypedParamsFree(now_params, now_nparams * max_id);
+    virTypedParamsFree(then_params, then_nparams * max_id);
     if (dom)
         virDomainFree(dom);
     return ret;