From 1e5b3e683aacab3f866abfa36e162177e80b6836 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 17 Aug 2009 12:26:08 -0700 Subject: [PATCH] menu: initialize cm (current menu) before empty check The empty check in the menu system used "cm", but before "cm" had actually been initialized. Move the "cm" initialization earlier so we do the right thing here. Reported-by: CKSoon Signed-off-by: H. Peter Anvin --- com32/menu/menumain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index 5b568fe..f3f0154 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -1101,12 +1101,13 @@ int menu_main(int argc, char *argv[]) m->mparm[i] = max(m->mparm[i] + rows, 0); } + cm = start_menu; + if (!cm->nentries) { fputs("Initial menu has no LABEL entries!\n", stdout); return 1; /* Error! */ } - cm = start_menu; for (;;) { cmdline = run_menu(); -- 2.7.4