mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: cli: Properly parse empty lines and avoid crashed

Browse Source 
Empty lines was not properly parsed and could lead to crashes because the
last argument was parsed outside of the cmdline buffer. Indeed, the last
argument is parsed to look for an eventual payload pattern. It is started
one character after the newline at the end of the command line. But it is
only valid for an non-empty command line.

So, now, this case is properly detected when we leave if an empty line is
detected.

This patch must be backported to 3.2.
This commit is contained in:
Christopher Faulet 2025-06-05 10:41:46 +02:00
parent 16eb0fab31
commit f5d41803d3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli.c
View File

@ -987,12 +987,18 @@ int cli_parse_cmdline(struct appctx *appctx)
continue;
}
if (!len)
goto process_cmdline;
/* The end of the command line was reached. Change the trailing \r, if any,
* by a null byte. For the command line, the trailing \r and \n are removed,
* but we conserve them for payload mode.
*/
if (str[len-1] == '\r')
if (str[len-1] == '\r') {
str[--len] = '\0';
if (!len)
goto process_cmdline;
}
/*
* Look for the "payload start" pattern at the end of a
@ -1055,6 +1061,7 @@ int cli_parse_cmdline(struct appctx *appctx)
}
}
process_cmdline:
if (!(appctx->st1 & APPCTX_CLI_ST1_PAYLOAD)) {
appctx->st0 = CLI_ST_PROCESS_CMDLINE;
break;