[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>
ipxe · Mar 6, 2013 · b8cbdbb · b8cbdbb
1 parent eb5a2ba
commit b8cbdbb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;