SecurityPkg: Remove temp return solution in PeiRsa2048Sha256 Section Lib

[mirror_edk2.git] / PerformancePkg / Dp_App / DpUtilities.c

diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c
index 38d2293d8516027631f4459668b60ff7cf6e4369..ec5a524475795652f838cec1936b2e215eb19265 100644 (file)
--- a/PerformancePkg/Dp_App/DpUtilities.c
+++ b/PerformancePkg/Dp_App/DpUtilities.c
@@ -156,10 +156,10 @@ GetShortPdbFileName (
   UINTN StartIndex;\r
   UINTN EndIndex;\r
 \r
-  ZeroMem (UnicodeBuffer, DXE_PERFORMANCE_STRING_LENGTH * sizeof (CHAR16));\r
+  ZeroMem (UnicodeBuffer, (DP_GAUGE_STRING_LENGTH + 1) * sizeof (CHAR16));\r
 \r
   if (PdbFileName == NULL) {\r
-    StrCpyS (UnicodeBuffer, DXE_PERFORMANCE_STRING_SIZE, L" ");\r
+    StrCpyS (UnicodeBuffer, DP_GAUGE_STRING_LENGTH + 1, L" ");\r
   } else {\r
     StartIndex = 0;\r
     for (EndIndex = 0; PdbFileName[EndIndex] != 0; EndIndex++)\r
@@ -178,8 +178,8 @@ GetShortPdbFileName (
     for (IndexA = StartIndex; IndexA < EndIndex; IndexA++) {\r
       UnicodeBuffer[IndexU] = (CHAR16) PdbFileName[IndexA];\r
       IndexU++;\r
-      if (IndexU >= DXE_PERFORMANCE_STRING_LENGTH) {\r
-        UnicodeBuffer[DXE_PERFORMANCE_STRING_LENGTH] = 0;\r
+      if (IndexU >= DP_GAUGE_STRING_LENGTH) {\r
+        UnicodeBuffer[DP_GAUGE_STRING_LENGTH] = 0;\r
         break;\r
       }\r
     }\r
@@ -290,10 +290,11 @@ GetNameFromHandle (
                                );\r
     SafeFreePool (BestLanguage);\r
     if (!EFI_ERROR (Status)) {\r
-      StrCpyS (\r
+      StrnCpyS (\r
         mGaugeString,\r
         DP_GAUGE_STRING_LENGTH + 1,\r
-        StringPtr\r
+        StringPtr,\r
+        DP_GAUGE_STRING_LENGTH\r
         );\r
       return;\r
     }\r
@@ -337,10 +338,11 @@ GetNameFromHandle (
         //\r
         // Method 3. Get the name string from FFS UI section\r
         //\r
-        StrCpyS (\r
+        StrnCpyS (\r
           mGaugeString,\r
           DP_GAUGE_STRING_LENGTH + 1,\r
-          NameString\r
+          NameString,\r
+          DP_GAUGE_STRING_LENGTH\r
           );\r
         FreePool (NameString);\r
       } else {\r
@@ -356,10 +358,11 @@ GetNameFromHandle (
       //\r
       NameString = ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);\r
       if (NameString != NULL) {\r
-        StrCpyS (\r
+        StrnCpyS (\r
           mGaugeString,\r
           DP_GAUGE_STRING_LENGTH + 1,\r
-          NameString\r
+          NameString,\r
+          DP_GAUGE_STRING_LENGTH\r
           );\r
         FreePool (NameString);\r
         return;\r