From: Stefan Berger <stefanb@us.ibm.com>
Date: Mon, 4 Oct 2010 10:34:05 +0000 (-0400)
Subject: nwfilter: fix memory leaks
X-Git-Tag: v0.8.5~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e224f197c6844d31bdb94f727278050192492b4;p=thirdparty%2Flibvirt.git

nwfilter: fix memory leaks

Fixing memory leak shown by valgrind and freeing buffer in two more places.
---

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index bdd5c79054..3fbe08b05f 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -1508,7 +1508,11 @@ _iptablesCreateRuleInstance(int directionIn,
     }
 
     if (virBufferUse(&prefix)) {
-        virBufferVSprintf(&prefix, "%s", virBufferContentAndReset(&buf));
+        char *s = virBufferContentAndReset(&buf);
+
+        virBufferAdd(&prefix, s, -1);
+
+        VIR_FREE(s);
 
         final = &prefix;
 
@@ -1531,11 +1535,13 @@ _iptablesCreateRuleInstance(int directionIn,
 
 err_exit:
     virBufferFreeAndReset(&buf);
+    virBufferFreeAndReset(&prefix);
 
     return -1;
 
 exit_no_error:
     virBufferFreeAndReset(&buf);
+    virBufferFreeAndReset(&prefix);
 
     return 0;
 }