From df1fac6dea4158f7715a6fbef9e670a612d73dac Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Jun 2018 17:40:34 +0200 Subject: [PATCH] nspawn: free global variables before exiting This doesn't really matter much, but is prettier for valgrind --- src/nspawn/nspawn.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 7f11d66..2fcbf64 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -586,8 +586,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - free(arg_network_zone); - arg_network_zone = j; + free_and_replace(arg_network_zone, j); arg_network_veth = true; arg_private_network = true; @@ -4591,10 +4590,15 @@ finish: strv_free(arg_network_ipvlan); strv_free(arg_network_veth_extra); strv_free(arg_parameters); + free(arg_network_zone); + free(arg_network_namespace_path); + strv_free(arg_property); custom_mount_free_all(arg_custom_mounts, arg_n_custom_mounts); expose_port_free_all(arg_expose_ports); free(arg_root_hash); rlimit_free_all(arg_rlimit); + strv_free(arg_syscall_whitelist); + strv_free(arg_syscall_blacklist); arg_cpuset = cpu_set_mfree(arg_cpuset); return r < 0 ? EXIT_FAILURE : ret; -- 2.7.4