Fix build broken issue for ICC 9.0

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8960 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 97e808c60a0b00cebecc40a9b296d4108f582bfa..5fb764c297fdbe0b9057f3107028419cc87b4ace 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1050,7 +1050,7 @@ BOpt_GetBootOptions (
     }\r
     \r
     if (HiiString != NULL) {\r
-      NewLoadContext->Description = AllocateZeroPool(StrSize((UINT16*)LoadOptionPtr) + StrSize(HiiString));\r
+      NewLoadContext->Description = AllocateZeroPool(StringSize + StrSize(HiiString));\r
       StrCpy (NewLoadContext->Description, HiiString);\r
       if (StrnCmp ((UINT16*)LoadOptionPtr, L"0", 1) != 0) {\r
         StrCat (NewLoadContext->Description, L" ");\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index fcf6c7bb36966b082c2cb5ece1c5d216304245b7..817b2e0e0b1e768a7340a2399e8c548de76c94d2 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -204,6 +204,7 @@ CallBootManager (
   CHAR16                      *HiiString;\r
   CHAR16                      *BootStringNumber;\r
   UINTN                       DevicePathType;\r
+  UINTN                       BufferSize;\r
 \r
   gOption = NULL;\r
   InitializeListHead (&BdsBootOptionList);\r
@@ -312,7 +313,9 @@ CallBootManager (
     //\r
     if (HiiString != NULL) {\r
       BootStringNumber = Option->Description;\r
-      Option->Description = AllocateZeroPool(StrSize(BootStringNumber) + StrSize(HiiString));\r
+      BufferSize = StrSize(BootStringNumber);\r
+      BufferSize += StrSize(HiiString);\r
+      Option->Description = AllocateZeroPool(BufferSize);\r
       StrCpy (Option->Description, HiiString);\r
       if (StrnCmp (BootStringNumber, L"0", 1) != 0) {\r
         StrCat (Option->Description, L" ");\r