From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 6 Mar 2013 14:41:46 +0000 (+0000)
Subject: [menu] Prevent character code zero from acting as a shortcut key
X-Git-Tag: v1.20.1~1576
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8cbdbbb53512ff35515b3da78b8451b6b8906ae;p=thirdparty%2Fipxe.git

[menu] Prevent character code zero from acting as a shortcut key

Unrecognised keys may be returned by getkey() as character code zero,
which currently matches against the first menu item with no shortcut
key defined.

Prevent this unintended behaviour by explicitly checking that the menu
item has a defined shortcut key.

Reported-by: Ján ONDREJ (SAL) <ondrejj@salstar.sk>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/hci/tui/menu_ui.c b/src/hci/tui/menu_ui.c
index dfa1d2e76..497407953 100644
--- a/src/hci/tui/menu_ui.c
+++ b/src/hci/tui/menu_ui.c
@@ -247,7 +247,8 @@ static int menu_loop ( struct menu_ui *ui, struct menu_item **selected ) {
 				i = 0;
 				list_for_each_entry ( item, &ui->menu->items,
 						      list ) {
-					if ( item->shortcut == key ) {
+					if ( item->shortcut &&
+					     ( item->shortcut == key ) ) {
 						ui->selected = i;
 						chosen = 1;
 						break;