From c5daf2801a76ed56743c25fb6a35dee77440c6bc Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Wed, 28 Sep 2022 18:22:23 +0200 Subject: [PATCH] Revert "BUG/MINOR: config: don't count trailing spaces as empty arg" This reverts commit 5529424ef1c9aae4ca714a99ffca2082e533781f. Since this patch, HAProxy crashes when the first line of the configuration file contains more than one parameter because, on the first call of parse_line(), the output line is not allocated. Thus elements in the arguments array may point on invalid memory area. It may be considered as a bug to reference invalid memory area and should be fixed. But for now, it is safer to revert this patch If the reverted commit is backported, this one must be backported too. --- src/tools.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tools.c b/src/tools.c index 699021fab..f697eaccb 100644 --- a/src/tools.c +++ b/src/tools.c @@ -5750,10 +5750,7 @@ uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbarg /* end of output string */ EMIT_CHAR(0); - - /* don't add empty arg after trailing spaces */ - if (arg < argsmax && args[arg] && *(args[arg])) - arg++; + arg++; if (quote) { /* unmatched quote */