From: Aurélien Nephtali <aurelien.nephtali@gmail.com>
Date: Sat, 17 Feb 2018 19:53:11 +0000 (+0100)
Subject: BUG/MINOR: init: Add missing brackets in the code parsing -sf/-st
X-Git-Tag: v1.9-dev1~423
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39b89889e73baab618860d9f5a56e684c096850f;p=thirdparty%2Fhaproxy.git

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>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 98b18dafa6..8785b9f949 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1461,10 +1461,11 @@ static void init(int argc, char **argv)
 						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);