From: Julio Faracco <jcfaracco@gmail.com>
Date: Thu, 25 May 2017 22:28:14 +0000 (-0300)
Subject: lxc: Fix wrong VIR_FREE after a return statement
X-Git-Tag: v3.4.0-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7693f07feeebbb2109db19ac50c057aba442c3cc;p=thirdparty%2Flibvirt.git

lxc: Fix wrong VIR_FREE after a return statement

There is a VIR_FREE after a return statement. That code section is never
executed and for this reason the "tty" variable is not being freed. This
commit rearranges the logic.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
---

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index a9363421f8..af02b54605 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1143,8 +1143,8 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths)
             return -1;
 
         if (virFileBindMountDevice(ttyPaths[i], tty) < 0) {
-            return -1;
             VIR_FREE(tty);
+            return -1;
         }
 
         VIR_FREE(tty);