execute: account for -o path option count

This always works fine... until your exec() fails and you try to go and free it, you've overwritten the allocator's metadata (and potentially other stuff) and it fails. Signed-off-by: Tycho Andersen <tycho@tycho.ws>

execute: account for -o path option count
7ccdf146 · Tycho Andersen · Christian Brauner · 7977dda5 · 7ccdf146
Unverified Commit 7ccdf146 authored May 09, 2018 by Tycho Andersen Committed by Christian Brauner May 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

execute.c src/lxc/execute.c +3 -0

No files found.
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -57,6 +57,9 @@ static int execute_start(struct lxc_handler *handler, void* data)
 	if (lxc_log_has_valid_level())
 		argc_add += 2;

+	if (current_config->logfd != -1 || lxc_log_fd != -1)
+		argc_add += 2;
+
 	argv = malloc((argc + argc_add) * sizeof(*argv));
 	if (!argv) {
 		SYSERROR("Allocating init args failed");