From be0169f07e38b81dd96bca2e80610592d89f8550 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 28 Mar 2023 08:34:14 +1300 Subject: cli: Correct handling of invalid escape sequences in cread_line() The second call to cli_ch_process() is in the wrong place, meaning that the one of the characters of an invalid escape sequence is swallowed instead of being returned. Fix the bug and add a test to cover this. This behaviour matches that of the code before cli_getch() was introduced. This was verified on the commit before b08e9d4b66 i.e.: 7d850f85aad ("sandbox: Enable mmc command and legacy images") Signed-off-by: Simon Glass Reported-by: Heinrich Schuchardt --- include/cli.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/cli.h') diff --git a/include/cli.h b/include/cli.h index c777c90313f..094a6602d70 100644 --- a/include/cli.h +++ b/include/cli.h @@ -98,8 +98,8 @@ int cli_readline(const char *const prompt); * * @prompt: Prompt to display * @buffer: Place to put the line that is entered - * @timeout: Timeout in milliseconds, 0 if none - * Return: command line length excluding terminator, or -ve on error: of the + * @timeout: Timeout in seconds, 0 if none + * Return: command line length excluding terminator, or -ve on error: if the * timeout is exceeded (either CONFIG_BOOT_RETRY_TIME or the timeout * parameter), then -2 is returned. If a break is detected (Ctrl-C) then * -1 is returned. -- cgit v1.2.3