From b8cbdbbb53512ff35515b3da78b8451b6b8906ae Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 6 Mar 2013 14:41:46 +0000 Subject: [menu] Prevent character code zero from acting as a shortcut key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) Signed-off-by: Michael Brown --- src/hci/tui/menu_ui.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/hci/tui/menu_ui.c') 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; -- cgit