diff options
| author | Simon Glass <sjg@chromium.org> | 2023-03-28 08:34:13 +1300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-28 09:25:51 -0400 |
| commit | 17b45e684af98c1cf37648ad05a98d500b367c5a (patch) | |
| tree | 2453033d5e2077a2541844b4781e4d24623db11a /common | |
| parent | 41a88ad529b3943b1e465846eb24fe2c29203e35 (diff) | |
| download | u-boot-17b45e684af98c1cf37648ad05a98d500b367c5a.tar.gz | |
cli: Correct several bugs in cli_getch()
This function does not behave as expected when unknown escape sequences
are sent to it:
- it fails to store (and thus echo) the last character of the invalid
sequence
- it fails to set esc_len to 0 when it finishes emitting the invalid
sequence, meaning that the following character will appear to be part
of a new escape sequence
- it processes the first character of the rejected sequence as a valid
character, just starting the sequence all over again
The last two bugs conspire to produce an "impossible condition #876"
message which is the main symptom of this behaviour.
Fix these bugs and add a test to verify the behaviour.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cli_getch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cli_getch.c b/common/cli_getch.c index 87c23edcf4..61d4cb261b 100644 --- a/common/cli_getch.c +++ b/common/cli_getch.c @@ -129,7 +129,7 @@ static int cli_ch_esc(struct cli_ch_state *cch, int ichar, *actp = act; - return act == ESC_CONVERTED ? ichar : 0; + return ichar; } int cli_ch_process(struct cli_ch_state *cch, int ichar) @@ -145,6 +145,7 @@ int cli_ch_process(struct cli_ch_state *cch, int ichar) return cch->esc_save[cch->emit_upto++]; cch->emit_upto = 0; cch->emitting = false; + cch->esc_len = 0; } return 0; } else if (ichar == -ETIMEDOUT) { @@ -185,7 +186,7 @@ int cli_ch_process(struct cli_ch_state *cch, int ichar) cch->esc_save[cch->esc_len++] = ichar; ichar = cch->esc_save[cch->emit_upto++]; cch->emitting = true; - break; + return ichar; case ESC_CONVERTED: /* valid escape sequence, return the resulting char */ cch->esc_len = 0; |