IntelFrameworkModulePkg/BdsDxe: rebase to ARRAY_SIZE()

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMngr / BootManager.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index 978959d6e7b6a35a37cc7369605b57472625b5dc..9ee063859ce1fe7a6258127ae4c3bd6086d6cb8f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -305,7 +305,7 @@ CallBootManager (
                      HiiHandle,\r
                      0,\r
                      mDeviceTypeStr[\r
-                       MIN (DeviceType & 0xF, sizeof (mDeviceTypeStr) / sizeof (mDeviceTypeStr[0]) - 1)\r
+                       MIN (DeviceType & 0xF, ARRAY_SIZE (mDeviceTypeStr) - 1)\r
                        ],\r
                      NULL\r
                      );\r
@@ -319,8 +319,9 @@ CallBootManager (
 \r
     TempStr = DevicePathToStr (Option->DevicePath);\r
     HelpSize = StrSize (TempStr) + StrSize (L"Device Path : ");\r
-    HelpString = AllocateCopyPool (HelpSize, L"Device Path : ");\r
+    HelpString = AllocateZeroPool (HelpSize);\r
     ASSERT (HelpString != NULL);\r
+    StrCatS (HelpString, HelpSize / sizeof (CHAR16), L"Device Path : ");\r
     StrCatS (HelpString, HelpSize / sizeof (CHAR16), TempStr);\r
 \r
     HelpToken = HiiSetString (HiiHandle, 0, HelpString, NULL);\r