commit 39b89889e73baab618860d9f5a56e684c096850f
author Aurélien Nephtali <aurelien.nephtali@gmail.com> Sat Feb 17 20:53:11 2018 +0100
committer Willy Tarreau <w@1wt.eu> Mon Feb 19 08:02:21 2018 +0100
tree f06c984af2d9073ee9ef2efb46a8b9b106ac2170
parent 4ee76d0281a49d2e32f2e5705c1ad6ac5e5f7aa0

BUG/MINOR: init: Add missing brackets in the code parsing -sf/-st

The codes tries to strip trailing spaces of arguments but due to missing
brackets, it will always exit.

It can be reproduced with this (silly) example:

$ haproxy -f /etc/haproxy/haproxy.cfg -sf 1234 "1235 " 1236
$ echo $?
1

This was introduced in commit 236062f7c ("MINOR: init: emit warning when
-sf/-sd cannot parse argument")

Signed-off-by: Aurélien Nephtali <aurelien.nephtali@gmail.com>

src/haproxy.c

diff --git a/src/haproxy.c b/src/haproxy.c
index 98b18da..8785b9f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1461,10 +1461,11 @@
 						exit(1);
 					} else if (endptr && strlen(endptr)) {
 						while (isspace(*endptr)) endptr++;
-						if (*endptr != 0)
+						if (*endptr != 0) {
 							ha_alert("-%2s option: some bytes unconsumed in PID list {%s}\n",
 								 flag, endptr);
 							exit(1);
+						}
 					}
 					if (oldpids[nb_oldpids] <= 0)
 						usage(progname);