IntelFrameworkPkg FrameworkUefiLib: Use safe string functions

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

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

1 files changed, 2 insertions, 6 deletions

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
index 63b077542f..9a9503e030 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
@@ -2,7 +2,7 @@
   Mde UEFI library API implementation.

   Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE

 

-  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2007 - 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

@@ -754,16 +754,12 @@ CatVSPrint (
     SizeRequired = sizeof(CHAR16) + (CharactersRequired * sizeof(CHAR16));

   }

 

-  BufferToReturn = AllocateZeroPool(SizeRequired);

+  BufferToReturn = AllocateCopyPool(SizeRequired, String);

 

   if (BufferToReturn == NULL) {

     return NULL;

   }

 

-  if (String != NULL) {

-    StrCpy(BufferToReturn, String);

-  }

-

   UnicodeVSPrint(BufferToReturn + StrLen(BufferToReturn), (CharactersRequired+1) * sizeof(CHAR16), FormatString, Marker);

 

   ASSERT(StrSize(BufferToReturn)==SizeRequired);