tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,14 +1382,14 @@ 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 {
//
@ -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);