Cc: Jian J Wang <[email protected]>
Cc: Liming Gao <[email protected]>
Cc: Dandan Bi <[email protected]>
Cc: Eric Dong <[email protected]>
Cc: [email protected]
Cc: Jiewen Yao <[email protected]>
Signed-off-by: JoeX Lu <[email protected]>
---
MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 20 ++++++++++++-------
.../HashLibBaseCryptoRouterPei.c | 19 ++++++++++++++----
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 63a37ab59a..a024d3b8d2 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -3415,25 +3415,31 @@ HiiCreateGuidOpCode (
IN UINTN OpCodeSize
)
{
- EFI_IFR_GUID OpCode;
+ EFI_IFR_GUID *OpCode;
EFI_IFR_GUID *OpCodePointer;
ASSERT (Guid != NULL);
ASSERT (OpCodeSize >= sizeof (OpCode));
- ZeroMem (&OpCode, sizeof (OpCode));
- CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);
+ OpCode = (EFI_IFR_GUID *) AllocateZeroPool (sizeof (EFI_IFR_GUID));
+ if (OpCode == NULL) {
+ return NULL;
+ }
+ CopyGuid ((EFI_GUID *)(VOID *)&OpCode->Guid, Guid);
OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (
OpCodeHandle,
- &OpCode,
+ OpCode,
EFI_IFR_GUID_OP,
- sizeof (OpCode),
- OpCodeSize - sizeof (OpCode),
+ sizeof (EFI_IFR_GUID),
+ OpCodeSize - sizeof (EFI_IFR_GUID),
0
);
if ((OpCodePointer != NULL) && (GuidOpCode != NULL)) {
- CopyMem (OpCodePointer + 1, (EFI_IFR_GUID *)GuidOpCode + 1, OpCodeSize -
sizeof (OpCode));
+ CopyMem (OpCodePointer + 1, (EFI_IFR_GUID *)GuidOpCode + 1, OpCodeSize -
sizeof (EFI_IFR_GUID));
+ }
+ if (OpCode != NULL) {
+ FreePool (OpCode);
}
return (UINT8 *)OpCodePointer;
diff --git
a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
index eeb424b6c3..c8052fed15 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
@@ -84,11 +84,22 @@ InternalCreateHashInterfaceHob (
EFI_GUID *Identifier
)
{
- HASH_INTERFACE_HOB LocalHashInterfaceHob;
+ HASH_INTERFACE_HOB *LocalHashInterfaceHob;
+ HASH_INTERFACE_HOB *HobBuffer;
- ZeroMem (&LocalHashInterfaceHob, sizeof (LocalHashInterfaceHob));
- CopyGuid (&LocalHashInterfaceHob.Identifier, Identifier);
- return BuildGuidDataHob (&mHashLibPeiRouterGuid, &LocalHashInterfaceHob,
sizeof (LocalHashInterfaceHob));
+ HobBuffer = NULL;
+ LocalHashInterfaceHob = AllocateZeroPool (sizeof (HASH_INTERFACE_HOB));
+ if (LocalHashInterfaceHob == NULL) {
+ return NULL;
+ }
+
+ CopyGuid (&LocalHashInterfaceHob->Identifier, Identifier);
+ HobBuffer = (HASH_INTERFACE_HOB *) BuildGuidDataHob (&mHashLibPeiRouterGuid,
&LocalHashInterfaceHob, sizeof (LocalHashInterfaceHob));
+
+ if (LocalHashInterfaceHob != NULL) {
+ FreePool (LocalHashInterfaceHob);
+ }
+ return HobBuffer;
}
/**
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103667): https://edk2.groups.io/g/devel/message/103667
Mute This Topic: https://groups.io/mt/98524246/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
