From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 19 Feb 2019 22:46:34 +0000 (+0100)
Subject: conf: cleanup macros idmaptool_on_path_[...]
X-Git-Tag: lxc-3.2.0~132^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48411df2d7aae47f8ffe3ef972a5539a82f22635;p=thirdparty%2Flxc.git

conf: cleanup macros idmaptool_on_path_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 76d85c0f0..f7ad1ba2f 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2839,7 +2839,7 @@ int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
  */
 static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
 {
-	char *path;
+	__do_free char *path = NULL;
 	int ret;
 	struct stat st;
 	int fret = 0;
@@ -2895,7 +2895,6 @@ static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
 #endif
 
 cleanup:
-	free(path);
 	return fret;
 }