commit ecd58a2511ddbf72125575609a8ac144a1edba52
author Hao Wu <hao.a.wu@intel.com> Tue Jun 30 06:31:05 2015 +0000
committer hwu1225 <hwu1225@Edk2> Tue Jun 30 06:31:05 2015 +0000
tree 5daaf0c5bc435aafbaf3f552e7f20f1092dfebc1
parent 274e8433567bf4a30e8dcfc2d290d3c7899171f6

PerformancePkg Dp_App: Use safe string functions

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

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

PerformancePkg/Dp_App/DpUtilities.c

diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c
index 73666aa..38d2293 100644
--- a/PerformancePkg/Dp_App/DpUtilities.c
+++ b/PerformancePkg/Dp_App/DpUtilities.c
@@ -1,7 +1,7 @@
 /** @file

   Utility functions used by the Dp application.

 

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

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

@@ -159,7 +159,7 @@
   ZeroMem (UnicodeBuffer, DXE_PERFORMANCE_STRING_LENGTH * sizeof (CHAR16));

 

   if (PdbFileName == NULL) {

-    StrCpy (UnicodeBuffer, L" ");

+    StrCpyS (UnicodeBuffer, DXE_PERFORMANCE_STRING_SIZE, L" ");

   } else {

     StartIndex = 0;

     for (EndIndex = 0; PdbFileName[EndIndex] != 0; EndIndex++)

@@ -290,8 +290,11 @@
                                );

     SafeFreePool (BestLanguage);

     if (!EFI_ERROR (Status)) {

-      StrnCpy (mGaugeString, StringPtr, DP_GAUGE_STRING_LENGTH);

-      mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;

+      StrCpyS (

+        mGaugeString,

+        DP_GAUGE_STRING_LENGTH + 1,

+        StringPtr

+        );

       return;

     }

   }

@@ -334,8 +337,11 @@
         //

         // Method 3. Get the name string from FFS UI section

         //

-        StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);

-        mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;

+        StrCpyS (

+          mGaugeString,

+          DP_GAUGE_STRING_LENGTH + 1,

+          NameString

+          );

         FreePool (NameString);

       } else {

         //

@@ -350,8 +356,11 @@
       //

       NameString = ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);

       if (NameString != NULL) {

-        StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);

-        mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;

+        StrCpyS (

+          mGaugeString,

+          DP_GAUGE_STRING_LENGTH + 1,

+          NameString

+          );

         FreePool (NameString);

         return;

       }

@@ -363,7 +372,7 @@
   //

   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_ERROR_NAME), NULL);

   ASSERT (StringPtr != NULL);

-  StrCpy (mGaugeString, StringPtr);

+  StrCpyS (mGaugeString, DP_GAUGE_STRING_LENGTH + 1, StringPtr);

   FreePool (StringPtr);

   return;

 }