From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 8 Dec 2020 16:24:08 +0000 (+0100)
Subject: confile: cleanup clr_config_rootfs_options()
X-Git-Tag: lxc-5.0.0~330^2~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30f8754d2357a5b3dd3f600df156991913829527;p=thirdparty%2Flxc.git

confile: cleanup clr_config_rootfs_options()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 8416e6a71..16310a5a0 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -4716,11 +4716,8 @@ static inline int clr_config_rootfs_mount(const char *key, struct lxc_conf *c,
 static inline int clr_config_rootfs_options(const char *key, struct lxc_conf *c,
 					    void *data)
 {
-	free(c->rootfs.options);
-	c->rootfs.options = NULL;
-
-	free(c->rootfs.data);
-	c->rootfs.data = NULL;
+	free_disarm(c->rootfs.options);
+	free_disarm(c->rootfs.data);
 
 	return 0;
 }