1, Change name of PcdPlatformBootTimeoutDefault to PcdPlatformBootTimeout, now this...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / UpdatePage.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 9fa2556cd5029e60b6ee7706f0878bee33608237..6831289addd20b009cf24cf60024a5a2f1c61def 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -526,7 +526,6 @@ UpdateOrderPage (
     return ;\r
   }\r
   \r
-  ASSERT (OptionMenu->MenuNumber <= (sizeof (IfrOptionList) / sizeof (IfrOptionList[0])));\r
   for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
     NewMenuEntry = BOpt_GetMenuEntry (OptionMenu, Index);\r
     IfrOptionList[Index].StringToken = NewMenuEntry->DisplayStringToken;\r
@@ -652,7 +651,7 @@ UpdateTimeOutPage (
 \r
   UpdatePageStart (CallbackData);\r
 \r
-  BootTimeOut = BdsLibGetTimeout ();\r
+  BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut);\r
 \r
   CreateNumericOpCode (\r
     (EFI_QUESTION_ID) BOOT_TIME_OUT_QUESTION_ID,\r
@@ -691,6 +690,7 @@ UpdateConModePage (
   UINTN                         Row;\r
   CHAR16                        RowString[50];\r
   CHAR16                        ModeString[50];\r
+  UINTN                         TempStringLen;\r
   UINTN                         MaxMode;\r
   UINTN                         ValidMode;\r
   EFI_STRING_ID                 *ModeToken;\r
@@ -745,11 +745,11 @@ UpdateConModePage (
     //\r
     // Build mode string Column x Row\r
     //\r
-    UnicodeValueToString (ModeString, 0, Col, 0);\r
-    ASSERT ((StrLen (ModeString)  + 1) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
+    TempStringLen = UnicodeValueToString (ModeString, 0, Col, 0);\r
+    ASSERT ((TempStringLen + StrLen (L" x ")) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
     StrCat (ModeString, L" x ");\r
-    UnicodeValueToString (RowString, 0, Row, 0);\r
-    ASSERT ((StrLen (ModeString)  + StrLen(RowString)) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
+    TempStringLen = UnicodeValueToString (RowString, 0, Row, 0);\r
+    ASSERT ((StrLen (ModeString)  + TempStringLen) < (sizeof (ModeString) / sizeof (ModeString[0])));\r
     StrCat (ModeString, RowString);\r
 \r
     HiiLibNewString (CallbackData->BmmHiiHandle, &ModeToken[Index], ModeString);\r