]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: free global variables before exiting 9291/head
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Jun 2018 15:40:34 +0000 (17:40 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Jun 2018 15:51:40 +0000 (17:51 +0200)
This doesn't really matter much, but is prettier for valgrind

src/nspawn/nspawn.c

index 7f11d6606286152bb22a7784146f6207d50be1dc..2fcbf64af71271f6135a51fbd564b716f81d8086 100644 (file)
@@ -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;