diff options
| author | Toomas Soome <tsoome@me.com> | 2019-12-03 20:05:44 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-12-06 09:11:30 +0200 |
| commit | bb4b7f47acc2c683b79216e79167725745ca353b (patch) | |
| tree | 1b1c3159c187d079b404b78352d95f5257eea984 /usr/src | |
| parent | 9d0a7db04e3ca196c0efd6a99b66a2a7d42085e8 (diff) | |
| download | illumos-gate-bb4b7f47acc2c683b79216e79167725745ca353b.tar.gz | |
12049 loader: ReadKeyStrokeEx may return partial keystrokes
Reviewed by: Randy Fishel <randyf@sibernet.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/efi/libefi/efi_console.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index fe203cd434..c4f359f686 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2019.12.02.1 +BOOT_VERSION = $(LOADER_VERSION)-2019.12.03.1 diff --git a/usr/src/boot/sys/boot/efi/libefi/efi_console.c b/usr/src/boot/sys/boot/efi/libefi/efi_console.c index 147be6ea88..34c88b6e99 100644 --- a/usr/src/boot/sys/boot/efi/libefi/efi_console.c +++ b/usr/src/boot/sys/boot/efi/libefi/efi_console.c @@ -674,10 +674,11 @@ efi_readkey_ex(EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *coninex) kp->UnicodeChar++; } } + if (kp->ScanCode == 0 && kp->UnicodeChar == 0) + return (false); + keybuf_inschar(kp); + return (true); } - - keybuf_inschar(kp); - return (true); } return (false); } |