]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: startup: usage() when no -cc arguments
authorWilliam Lallemand <wlallemand@haproxy.org>
Fri, 6 May 2022 15:22:36 +0000 (17:22 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Fri, 6 May 2022 15:22:36 +0000 (17:22 +0200)
Exit correctly with usage() instead of segfaulting when no argument
were passed to -cc.

Must be backported in 2.5.

src/haproxy.c

index ec40a6427891251fb95cebbb1d4d2b575e65a12c..266f5552bc0f003bf8be0d28f28380d61b75cb72 100644 (file)
@@ -1943,9 +1943,13 @@ static void init(int argc, char **argv)
 
                char *args[MAX_LINE_ARGS+1];
                int arg = sizeof(args) / sizeof(*args);
-               size_t outlen = strlen(check_condition) + 1;
+               size_t outlen;
                char *w;
 
+               if (!check_condition)
+                       usage(progname);
+
+               outlen = strlen(check_condition) + 1;
                err = parse_line(check_condition, check_condition, &outlen, args, &arg,
                                 PARSE_OPT_ENV | PARSE_OPT_WORD_EXPAND | PARSE_OPT_DQUOTE | PARSE_OPT_SQUOTE | PARSE_OPT_BKSLASH,
                                 &errptr);