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.3-dev4~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=398da62c38014c76006571e0caa52a3799f41815;p=thirdparty%2Fhaproxy.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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 409aef79cf..e8cbdf4106 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1178,6 +1178,10 @@ static char **copy_argv(int argc, char **argv)
 								argc--;
 								argv++;
 							}
+						} else {
+							argc--;
+							argv++;
+
 						}
 						break;