From: Paweł Krześniak <pawel.krzesniak@gmail.com>
Date: Mon, 20 Dec 2010 11:31:19 +0000 (+0100)
Subject: bridge_driver: avoid double call to VIR_FREE
X-Git-Tag: v0.8.7~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed039abc09bce5c890881a2b3b456f536fc6014a;p=thirdparty%2Flibvirt.git

bridge_driver: avoid double call to VIR_FREE

While not technically a double free (since VIR_FREE NULLs the
pointer), this is unnecessary extra code.

This crept in when the function was converted from virRun to virCommand.

The AUTHORS file has also been updated.
---

diff --git a/AUTHORS b/AUTHORS
index e065b185dc..b204bd6e09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,6 +141,7 @@ Patches have also been contributed by:
   MORITA Kazutaka      <morita.kazutaka@lab.ntt.co.jp>
   Josh Durgin          <joshd@hq.newdream.net>
   Roopa Prabhu         <roprabhu@cisco.com>
+  Paweł Krześniak      <pawel.krzesniak@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index c3f32d7826..b0834ae2cb 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -557,7 +557,6 @@ dhcpStartDhcpDaemon(virNetworkObjPtr network)
 
     cmd = virCommandNew(DNSMASQ);
     if (networkBuildDnsmasqArgv(network, pidfile, cmd) < 0) {
-        VIR_FREE(pidfile);
         goto cleanup;
     }