From: William Lallemand <wlallemand@haproxy.com>
Date: Mon, 8 Jun 2020 08:01:13 +0000 (+0200)
Subject: BUG/MINOR: mworker: fix a memleak when execvp() failed
X-Git-Tag: v2.1.6~1
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=4f37a3df7cb06811d21b785b4499d2a5ae16d93b;p=haproxy-2.1.git

BUG/MINOR: mworker: fix a memleak when execvp() failed

Free next_argv when execvp() failed.

Must be backported as far as 1.8.

Should fix issue #668.

(cherry picked from commit 9fc6c97fb30bb9c15d6b6e34c917b0b5aba7486a)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index d97c1f3..42f898f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -853,6 +853,8 @@ void mworker_reload()
 	execvp(next_argv[0], next_argv);
 
 	ha_warning("Failed to reexecute the master process [%d]: %s\n", pid, strerror(errno));
+	free(next_argv);
+	next_argv = NULL;
 	return;
 
 alloc_error: