[syslinux:master] menu: Don't highlight disabled entries

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Oct 22 12:51:14 PDT 2012

Commit-ID:  c823574f53c1729790a5d38d02204118389cddf6
Gitweb:     http://www.syslinux.org/commit/c823574f53c1729790a5d38d02204118389cddf6
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 9 Oct 2012 13:33:51 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 9 Oct 2012 14:04:17 +0100

menu: Don't highlight disabled entries

There's an off-by-one bug in the menu input handling code which makes
it possible to highlight/select the last entry in a menu even if that
entry is disabled.

It should be noted that you can't actually *do* anything with the
disabled entry, i.e. edit or execute it. Still, allowing it to be
highlighted does look a little strange.

Reported-by: Matt Sephton <matt.sephton at gmail.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>

 com32/menu/menumain.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c
index 5b3f6bd..7c58979 100644
--- a/com32/menu/menumain.c
+++ b/com32/menu/menumain.c
@@ -958,8 +958,7 @@ static const char *run_menu(void)
 	case KEY_DOWN:
 	case KEY_CTRL('N'):
-	    while (entry < cm->nentries - 1) {
-		entry++;
+	    while (++entry < cm->nentries) {
 		if (entry >= top + MENU_ROWS)
 		    top += MENU_ROWS;
 		if (!is_disabled(cm->menu_entries[entry]))

More information about the Syslinux-commits mailing list