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

conf: cleanup macros parse_propagationopts

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index ef1d2051a..e9bbbb1ce 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1937,7 +1937,8 @@ static void parse_propagationopt(char *opt, unsigned long *flags)
 
 int parse_propagationopts(const char *mntopts, unsigned long *pflags)
 {
-	char *p, *s;
+	__do_free char *s = NULL;
+	char *p;
 
 	if (!mntopts)
 		return 0;
@@ -1951,7 +1952,6 @@ int parse_propagationopts(const char *mntopts, unsigned long *pflags)
 	*pflags = 0L;
 	lxc_iterate_parts(p, s, ",")
 		parse_propagationopt(p, pflags);
-	free(s);
 
 	return 0;
 }