From bded41b26836cd01b6520acbe487631a71a90cdc Mon Sep 17 00:00:00 2001
From: Hao Wu <hao.a.wu@intel.com>
Date: Tue, 30 Jun 2015 06:28:08 +0000
Subject: [PATCH] IntelFrameworkModulePkg DeviceMngr: 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@17738 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../BdsDxe/DeviceMngr/DeviceManager.c         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 85cbe8951d..5da0d470a3 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -1,7 +1,7 @@
 /** @file
   The platform device manager reference implementation
 
-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
@@ -374,13 +374,12 @@ GetMacAddressString(
   // The size is the Number size + ":" size + Vlan size(\XXXX) + End
   //
   BufferLen = (4 + 2 * HwAddressSize + (HwAddressSize - 1) + 5 + 1) * sizeof (CHAR16);
-  String = AllocateZeroPool (BufferLen);
+  String = AllocateCopyPool (BufferLen, L"MAC:");
   if (String == NULL) {
     return FALSE;
   }
 
   *PBuffer = String;
-  StrCpy(String, L"MAC:");
   String += 4;
   
   //
@@ -1383,15 +1382,15 @@ CallDriverHealth (
        String = (EFI_STRING) AllocateZeroPool (StringSize);
        ASSERT (String != NULL);
        
-       StrnCpy (String, DriverName, StringSize / sizeof(CHAR16));
+       StrCpyS (String, StringSize / sizeof(CHAR16), DriverName);
        if (!IsControllerNameEmpty) {
-        StrnCat (String, L"    ", StringSize / sizeof(CHAR16) - StrLen(String) - 1);
-        StrnCat (String, ControllerName, StringSize / sizeof(CHAR16) - StrLen(String) - 1);
+        StrCatS (String, StringSize / sizeof(CHAR16), L"    ");
+        StrCatS (String, StringSize / sizeof(CHAR16), ControllerName);
        }
 
-       StrnCat (String, L"    ", StringSize / sizeof(CHAR16) - StrLen(String) - 1);
-       StrnCat (String, TmpString, StringSize / sizeof(CHAR16) - StrLen(String) - 1);
-       
+       StrCatS (String, StringSize / sizeof(CHAR16), L"    ");
+       StrCatS (String, StringSize / sizeof(CHAR16), TmpString);
+
     } else {
       //
       // Update the string will be displayed base on the driver's health status
@@ -1423,13 +1422,13 @@ CallDriverHealth (
       String = (EFI_STRING) AllocateZeroPool (StringSize);
       ASSERT (String != NULL);
       
-      StrnCpy (String, DriverName, StringSize / sizeof(CHAR16));
+      StrCpyS (String, StringSize / sizeof (CHAR16), DriverName);
       if (!IsControllerNameEmpty) {
-        StrnCat (String, L"    ", StringSize / sizeof(CHAR16) - StrLen(String) - 1);
-        StrnCat (String, ControllerName, StringSize / sizeof(CHAR16) - StrLen(String) - 1);
+        StrCatS (String, StringSize / sizeof (CHAR16), L"    ");
+        StrCatS (String, StringSize / sizeof (CHAR16), ControllerName);
       }
 
-      StrnCat (String, TmpString, StringSize / sizeof(CHAR16) - StrLen(String) - 1);
+      StrCatS (String, StringSize / sizeof (CHAR16), TmpString);
     }
 
     FreePool (TmpString);
-- 
2.39.2