sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntelFrameworkModulePkg DeviceMngr: Use safe string functions

Browse Source 
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
This commit is contained in:
Hao Wu
2015-06-30 06:28:08 +00:00
committed by hwu1225
parent 44cbebec2a
commit bded41b268
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The platform device manager reference implementation 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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 // The size is the Number size + ":" size + Vlan size(\XXXX) + End
// //
BufferLen = (4 + 2 * HwAddressSize + (HwAddressSize - 1) + 5 + 1) * sizeof (CHAR16); BufferLen = (4 + 2 * HwAddressSize + (HwAddressSize - 1) + 5 + 1) * sizeof (CHAR16);
String = AllocateZeroPool (BufferLen); String = AllocateCopyPool (BufferLen, L"MAC:");
if (String == NULL) { if (String == NULL) {
return FALSE; return FALSE;
} }
*PBuffer = String; *PBuffer = String;
StrCpy(String, L"MAC:");
String += 4; String += 4;
// //
@ -1383,15 +1382,15 @@ CallDriverHealth (
String = (EFI_STRING) AllocateZeroPool (StringSize); String = (EFI_STRING) AllocateZeroPool (StringSize);
ASSERT (String != NULL); ASSERT (String != NULL);
StrnCpy (String, DriverName, StringSize / sizeof(CHAR16)); StrCpyS (String, StringSize / sizeof(CHAR16), DriverName);
if (!IsControllerNameEmpty) { if (!IsControllerNameEmpty) {
StrnCat (String, L" ", StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof(CHAR16), L" ");
StrnCat (String, ControllerName, StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof(CHAR16), ControllerName);
} }
StrnCat (String, L" ", StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof(CHAR16), L" ");
StrnCat (String, TmpString, StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof(CHAR16), TmpString);
} else { } else {
// //
// Update the string will be displayed base on the driver's health status // Update the string will be displayed base on the driver's health status
@ -1423,13 +1422,13 @@ CallDriverHealth (
String = (EFI_STRING) AllocateZeroPool (StringSize); String = (EFI_STRING) AllocateZeroPool (StringSize);
ASSERT (String != NULL); ASSERT (String != NULL);
StrnCpy (String, DriverName, StringSize / sizeof(CHAR16)); StrCpyS (String, StringSize / sizeof (CHAR16), DriverName);
if (!IsControllerNameEmpty) { if (!IsControllerNameEmpty) {
StrnCat (String, L" ", StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof (CHAR16), L" ");
StrnCat (String, ControllerName, StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof (CHAR16), ControllerName);
} }
StrnCat (String, TmpString, StringSize / sizeof(CHAR16) - StrLen(String) - 1); StrCatS (String, StringSize / sizeof (CHAR16), TmpString);
} }
FreePool (TmpString); FreePool (TmpString);