소스 검색

[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>
tags/v1.20.1
Michael Brown 11 년 전
부모
커밋
b8cbdbbb53
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2
    1
      src/hci/tui/menu_ui.c

+ 2
- 1
src/hci/tui/menu_ui.c 파일 보기

@@ -247,7 +247,8 @@ static int menu_loop ( struct menu_ui *ui, struct menu_item **selected ) {
247 247
 				i = 0;
248 248
 				list_for_each_entry ( item, &ui->menu->items,
249 249
 						      list ) {
250
-					if ( item->shortcut == key ) {
250
+					if ( item->shortcut &&
251
+					     ( item->shortcut == key ) ) {
251 252
 						ui->selected = i;
252 253
 						chosen = 1;
253 254
 						break;

Loading…
취소
저장