IntelFrameworkModulePkg: Replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr

It is the follow up of 3ab41b7a325ca11a12b42f5ad1661c4b6791cb49
to replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr with
UnicodeStrToAsciiStrS/AsciiStrToUnicodeStrS.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
(cherry picked from commit 9b82facd9cf6cb8b0d6ecacd2fc084f70650db62)

1 files changed, 6 insertions, 4 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 0a9238c2e7..f04da16598 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -1,7 +1,7 @@
 /** @file

   FrontPage routines to handle the callbacks and browser calls

 

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -300,6 +300,7 @@ InitializeFrontPage (
   EFI_STATUS                  Status;

   CHAR8                       *LangCode;

   CHAR8                       *Lang;

+  UINTN                       LangSize;

   CHAR8                       *CurrentLang;

   UINTN                       OptionCount;

   CHAR16                      *StringBuffer;

@@ -448,9 +449,10 @@ InitializeFrontPage (
       }

 

       if (EFI_ERROR (Status)) {

-        StringBuffer = AllocatePool (AsciiStrSize (Lang) * sizeof (CHAR16));

+        LangSize = AsciiStrSize (Lang);

+        StringBuffer = AllocatePool (LangSize * sizeof (CHAR16));

         ASSERT (StringBuffer != NULL);

-        AsciiStrToUnicodeStr (Lang, StringBuffer);

+        AsciiStrToUnicodeStrS (Lang, StringBuffer, LangSize);

       }

 

       ASSERT (StringBuffer != NULL);

@@ -702,7 +704,7 @@ GetOptionalStringByIndex (
     *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));

   } else {

     *String = AllocatePool (StrSize * sizeof (CHAR16));

-    AsciiStrToUnicodeStr (OptionalStrStart, *String);

+    AsciiStrToUnicodeStrS (OptionalStrStart, *String, StrSize);

   }

 

   return EFI_SUCCESS;