MINOR: config: Alert about extra arguments for errorfile and errorloc

errorfile and errorloc directives expect excatly two arguments. But extra
arguments were just ignored while an error should be emitted. It is now
fixed.

This patch could be backported as far as 2.2 if necessary.

(cherry picked from commit f578811c4e8965f243cd16a6f569909a2a07498c)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 03d6c648dfc3ab364149aa747c1574c847526193)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/http_htx.c b/src/http_htx.c
index 36356ed..9ed6d1b 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -1999,6 +1999,11 @@ static int proxy_parse_errorloc(char **args, int section, struct proxy *curpx,
                ret = -1;
                goto out;
        }
+       if (*(args[3])) {
+               memprintf(errmsg, "%s : expects exactly two arguments.\n", args[0]);
+               ret = -1;
+               goto out;
+       }
 
        status = atol(args[1]);
        errloc = (strcmp(args[0], "errorloc303") == 0 ? 303 : 302);
@@ -2066,6 +2071,11 @@ static int proxy_parse_errorfile(char **args, int section, struct proxy *curpx,
                ret = -1;
                goto out;
        }
+       if (*(args[3])) {
+               memprintf(errmsg, "%s : expects exactly two arguments.\n", args[0]);
+               ret = -1;
+               goto out;
+       }
 
        status = atol(args[1]);
        msg = http_parse_errorfile(status, args[2], errmsg);