\r
UpdatePageStart (CallbackData);\r
\r
- ASSERT (ConsoleMenu->MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.ConsoleCheck) / sizeof (CallbackData->BmmFakeNvData.ConsoleCheck[0])));\r
- for (Index = 0; Index < ConsoleMenu->MenuNumber; Index++) {\r
+ for (Index = 0; ((Index < ConsoleMenu->MenuNumber) && \\r
+ (Index < (sizeof (CallbackData->BmmFakeNvData.ConsoleCheck) / sizeof (UINT8)))) ; Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (ConsoleMenu, Index);\r
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;\r
CheckFlags = 0;\r
);\r
}\r
\r
- for (Index2 = 0; Index2 < TerminalMenu.MenuNumber; Index2++) {\r
+ for (Index2 = 0; ((Index2 < TerminalMenu.MenuNumber) && \\r
+ (Index2 < (sizeof (CallbackData->BmmFakeNvData.ConsoleCheck) / sizeof (UINT8)))); Index2++) {\r
CheckFlags = 0;\r
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index2);\r
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
ASSERT (OptionsOpCodeHandle != NULL);\r
\r
- for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
+ for (Index = 0; ((Index < OptionMenu->MenuNumber) && \\r
+ (Index < (sizeof (CallbackData->BmmFakeNvData.OptionOrder) / sizeof (UINT8))))); Index++) {\r
NewMenuEntry = BOpt_GetMenuEntry (OptionMenu, Index);\r
HiiCreateOneOfOptionOpCode (\r
OptionsOpCodeHandle,\r