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 <[email protected]> Cc: Bret Barkelew <[email protected]> Cc: Liming Gao <[email protected]> Signed-off-by: Michael D Kinney <[email protected]> Reviewed-by: Eric Jin <[email protected]> --- FmpDevicePkg/FmpDxe/FmpDxe.h | 1 + FmpDevicePkg/FmpDxe/FmpDxe.inf | 1 + FmpDevicePkg/FmpDxe/FmpDxeLib.inf | 1 + FmpDevicePkg/FmpDxe/VariableSupport.c | 19 ++++++++++++++----- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.h b/FmpDevicePkg/FmpDxe/FmpDxe.h index 28bfa41580..150f18b656 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.h +++ b/FmpDevicePkg/FmpDxe/FmpDxe.h @@ -23,6 +23,7 @@ #include <Library/UefiRuntimeServicesTableLib.h> #include <Library/MemoryAllocationLib.h> #include <Library/UefiLib.h> +#include <Library/PrintLib.h> #include <Library/FmpAuthenticationLib.h> #include <Library/FmpDeviceLib.h> #include <Library/FmpPayloadHeaderLib.h> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.inf b/FmpDevicePkg/FmpDxe/FmpDxe.inf index 361ae9a5fc..ca9709976b 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.inf +++ b/FmpDevicePkg/FmpDxe/FmpDxe.inf @@ -44,6 +44,7 @@ BaseMemoryLib UefiBootServicesTableLib MemoryAllocationLib + PrintLib UefiLib BaseCryptLib FmpAuthenticationLib diff --git a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf index cc4dca5e9c..a614bc638a 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf +++ b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf @@ -44,6 +44,7 @@ BaseMemoryLib UefiBootServicesTableLib MemoryAllocationLib + PrintLib UefiLib BaseCryptLib FmpAuthenticationLib diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c index 5b4242d932..2508d3bbe6 100644 --- a/FmpDevicePkg/FmpDxe/VariableSupport.c +++ b/FmpDevicePkg/FmpDxe/VariableSupport.c @@ -147,9 +147,15 @@ GenerateFmpVariableName ( IN CHAR16 *BaseVariableName ) { + UINTN Size; 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) { DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName)); return VariableName; @@ -157,10 +163,13 @@ GenerateFmpVariableName ( if (HardwareInstance == 0) { return VariableName; } - VariableName = CatSPrint (VariableName, L"%016lx", HardwareInstance); - if (VariableName == NULL) { - DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName)); - } + UnicodeValueToStringS ( + &VariableName[StrLen(BaseVariableName)], + Size, + PREFIX_ZERO | RADIX_HEX, + HardwareInstance, + 16 + ); return VariableName; } -- 2.20.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44762): https://edk2.groups.io/g/devel/message/44762 Mute This Topic: https://groups.io/mt/32676852/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
