mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

Revert "BUG/MINOR: config: don't count trailing spaces as empty arg"

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2022-09-28 18:22:23 +02:00
parent 5529424ef1
commit c5daf2801a
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools.c
View File

@ -5750,10 +5750,7 @@ uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbarg
/* end of output string */ /* end of output string */
EMIT_CHAR(0); EMIT_CHAR(0);
arg++;
/* don't add empty arg after trailing spaces */
if (arg < argsmax && args[arg] && *(args[arg]))
arg++;
if (quote) { if (quote) {
/* unmatched quote */ /* unmatched quote */