tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 23:54:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/Universal/PCD: Use safe string functions to refine code.

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17786 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2015-07-01 08:27:03 +00:00 committed by shenshushi
parent f5fc27424b
commit e85e284e25
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Universal/PCD/Dxe/Service.c
View File

@ -142,6 +142,7 @@ GetPcdName (
{ {
PCD_DATABASE_INIT *Database; PCD_DATABASE_INIT *Database;
UINT8 *StringTable; UINT8 *StringTable;
UINTN NameSize;
PCD_NAME_INDEX *PcdNameIndex; PCD_NAME_INDEX *PcdNameIndex;
CHAR8 *TokenSpaceName; CHAR8 *TokenSpaceName;
CHAR8 *PcdName; CHAR8 *PcdName;
@ -188,14 +189,15 @@ GetPcdName (
// //
// Need to get the full PCD name. // Need to get the full PCD name.
// //
Name = AllocateZeroPool (AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName)); NameSize = AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName);
Name = AllocateZeroPool (NameSize);
ASSERT (Name != NULL); ASSERT (Name != NULL);
// //
// Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name. // Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name.
// //
AsciiStrCat (Name, TokenSpaceName); AsciiStrCatS (Name, NameSize, TokenSpaceName);
Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.'; Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';
AsciiStrCat (Name, PcdName); AsciiStrCatS (Name, NameSize, PcdName);
} }
return Name; return Name;

8
MdeModulePkg/Universal/PCD/Pei/Service.c
View File

@ -107,6 +107,7 @@ GetPcdName (
) )
{ {
UINT8 *StringTable; UINT8 *StringTable;
UINTN NameSize;
PCD_NAME_INDEX *PcdNameIndex; PCD_NAME_INDEX *PcdNameIndex;
CHAR8 *TokenSpaceName; CHAR8 *TokenSpaceName;
CHAR8 *PcdName; CHAR8 *PcdName;
@ -144,14 +145,15 @@ GetPcdName (
// //
// Need to get the full PCD name. // Need to get the full PCD name.
// //
Name = AllocateZeroPool (AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName)); NameSize = AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName);
Name = AllocateZeroPool (NameSize);
ASSERT (Name != NULL); ASSERT (Name != NULL);
// //
// Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name. // Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name.
// //
AsciiStrCat (Name, TokenSpaceName); AsciiStrCatS (Name, NameSize, TokenSpaceName);
Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.'; Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';
AsciiStrCat (Name, PcdName); AsciiStrCatS (Name, NameSize, PcdName);
} }
return Name; return Name;