Merge pull request #2000 from hallyn/2017-12-04/execargs

lxc_execute: properly figure out number of needed arguments

Merge pull request #2000 from hallyn/2017-12-04/execargs
4fe9a9b7 · Christian Brauner · GitHub · 68eeee2f · 858faf70 · 4fe9a9b7
Unverified Commit 4fe9a9b7 authored Dec 05, 2017 by Christian Brauner Committed by GitHub Dec 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

execute.c src/lxc/execute.c +6 -6

No files found.
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -49,14 +49,14 @@ static int execute_start(struct lxc_handler *handler, void* data)

 	while (my_args->argv[argc++]);

-	argc_add = 4;
+	/* lxc-init -n name -- [argc] NULL -> 5 */
+	argc_add = 5;
 	if (my_args->quiet)
 		argc_add++;
-	if (!handler->conf->rootfs.path) {
-		argc_add += 4;
-		if (lxc_log_has_valid_level())
-			argc_add += 2;
-	}
+	if (!handler->conf->rootfs.path)
+		argc_add += 2;
+	if (lxc_log_has_valid_level())
+		argc_add += 2;

 	argv = malloc((argc + argc_add) * sizeof(*argv));
 	if (!argv)