From: William Lallemand <wlallemand@haproxy.org>
Date: Wed, 2 Sep 2020 14:12:23 +0000 (+0200)
Subject: BUG/MINOR: startup: haproxy -s cause 100% cpu
X-Git-Tag: v2.1.9~32
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=73ffd47a0c8ee98b67a9d6416321dc6819c3b818;p=haproxy-2.1.git

BUG/MINOR: startup: haproxy -s cause 100% cpu

It was reported in bug #837 that haproxy -s causes a 100% CPU.

However this option does not exist and haproxy must exit with the
usage message.

The parser was not handling the case where -s is not followed by 't' or
'f' which are the only two valid cases.

This bug was introduced by df6c5a ("BUG/MEDIUM: mworker: fix the copy of
options in copy_argv()") which was backported as far as 1.8.

This fix must be backported as far as 1.8.

(cherry picked from commit 398da62c38014c76006571e0caa52a3799f41815)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 93dec6abdbb23501802f988f95de717feb8d8a8d)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 9924a36..5609417 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1409,6 +1409,10 @@ static char **copy_argv(int argc, char **argv)
 								argc--;
 								argv++;
 							}
+						} else {
+							argc--;
+							argv++;
+
 						}
 						break;