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

FmpDevicePkg/FmpDxe: Remove use of CatSprint()

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1525

The size overhead for CatSPrint() is large.  This function
is only used to generate variable names with HardwareInstance
value appended.  Use UnicodeValueToStringS() instead that is
much smaller.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Eric Jin <eric.jin@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Eric Jin 2019-07-26 15:48:44 +08:00 committed by Liming Gao
parent 11d354945c
commit a5944b6a13
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FmpDevicePkg/FmpDxe/FmpDxe.h
View File

@ -23,6 +23,7 @@
#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/UefiLib.h> #include <Library/UefiLib.h>
#include <Library/PrintLib.h>
#include <Library/FmpAuthenticationLib.h> #include <Library/FmpAuthenticationLib.h>
#include <Library/FmpDeviceLib.h> #include <Library/FmpDeviceLib.h>
#include <Library/FmpPayloadHeaderLib.h> #include <Library/FmpPayloadHeaderLib.h>

1
FmpDevicePkg/FmpDxe/FmpDxe.inf
View File

@ -45,6 +45,7 @@
BaseMemoryLib BaseMemoryLib
UefiBootServicesTableLib UefiBootServicesTableLib
MemoryAllocationLib MemoryAllocationLib
PrintLib
UefiLib UefiLib
BaseCryptLib BaseCryptLib
FmpAuthenticationLib FmpAuthenticationLib

1
FmpDevicePkg/FmpDxe/FmpDxeLib.inf
View File

@ -45,6 +45,7 @@
BaseMemoryLib BaseMemoryLib
UefiBootServicesTableLib UefiBootServicesTableLib
MemoryAllocationLib MemoryAllocationLib
PrintLib
UefiLib UefiLib
BaseCryptLib BaseCryptLib
FmpAuthenticationLib FmpAuthenticationLib

19
FmpDevicePkg/FmpDxe/VariableSupport.c
View File

@ -147,9 +147,15 @@ GenerateFmpVariableName (
IN CHAR16 *BaseVariableName IN CHAR16 *BaseVariableName
) )
{ {
UINTN Size;
CHAR16 *VariableName; CHAR16 *VariableName;
VariableName = CatSPrint (NULL, BaseVariableName); //
// Allocate Unicode string with room for BaseVariableName and a 16 digit
// hexadecimal value for the HardwareInstance value.
//
Size = StrSize (BaseVariableName) + 16 * sizeof (CHAR16);
VariableName = AllocateCopyPool (Size, BaseVariableName);
if (VariableName == NULL) { if (VariableName == NULL) {
DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName)); DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName));
return VariableName; return VariableName;
@ -157,10 +163,13 @@ GenerateFmpVariableName (
if (HardwareInstance == 0) { if (HardwareInstance == 0) {
return VariableName; return VariableName;
} }
VariableName = CatSPrint (VariableName, L"%016lx", HardwareInstance); UnicodeValueToStringS (
if (VariableName == NULL) { &VariableName[StrLen(BaseVariableName)],
DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName)); Size,
} PREFIX_ZERO | RADIX_HEX,
HardwareInstance,
16
);
return VariableName; return VariableName;
} }