IntelFrameworkModulePkg BdsDxe: Use safe string functions

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17735 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 7 insertions, 7 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index a0c638100a..5646457664 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 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2015, 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

@@ -628,9 +628,9 @@ ConvertProcessorToString (
   StringBuffer = AllocateZeroPool (0x20);

   ASSERT (StringBuffer != NULL);

   Index = UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, FreqMhz / 1000, 3);

-  StrCat (StringBuffer, L".");

+  StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L".");

   UnicodeValueToString (StringBuffer + Index + 1, PREFIX_ZERO, (FreqMhz % 1000) / 10, 2);

-  StrCat (StringBuffer, L" GHz");

+  StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L" GHz");

   *String = (CHAR16 *) StringBuffer;

   return ;

 }

@@ -654,7 +654,7 @@ ConvertMemorySizeToString (
   StringBuffer = AllocateZeroPool (0x20);

   ASSERT (StringBuffer != NULL);

   UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, MemorySize, 6);

-  StrCat (StringBuffer, L" MB RAM");

+  StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L" MB RAM");

 

   *String = (CHAR16 *) StringBuffer;

 

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
index 5a6fa78553..eef840b882 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -1,7 +1,7 @@
 /** @file

   Perform the platform memory test

 

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

+Copyright (c) 2004 - 2015, 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

@@ -324,7 +324,7 @@ BdsMemoryTest (
           //

           // TmpStr size is 64, StrPercent is reserved to 16.

           //

-          StrnCat (StrPercent, TmpStr, sizeof (StrPercent) / sizeof (CHAR16) - StrLen (StrPercent) - 1);

+          StrCatS (StrPercent, sizeof (StrPercent) / sizeof (CHAR16), TmpStr);

           PrintXY (10, 10, NULL, NULL, StrPercent);

           FreePool (TmpStr);

         }

@@ -389,7 +389,7 @@ Done:
 

     TmpStr = GetStringById (STRING_TOKEN (STR_MEM_TEST_COMPLETED));

     if (TmpStr != NULL) {

-      StrnCat (StrTotalMemory, TmpStr, StrTotalMemorySize / sizeof (CHAR16) - StrLen (StrTotalMemory) - 1);

+      StrCatS (StrTotalMemory, StrTotalMemorySize / sizeof (CHAR16), TmpStr);

       FreePool (TmpStr);

     }