[PATCH v2] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT.


Nickle Wang
 

From the function description of GetIfrBinaryData(), FormSetGuid can be
NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes exception
when FormSetGuid is NULL.

Signed-off-by: Nickle Wang <nickle.wang@...>
---
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 288f1c3197..82067b541c 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2,6 +2,7 @@
Entry and initialization module for the browser.

Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent

**/
@@ -5844,7 +5845,7 @@ GetIfrBinaryData (
//
// Try to compare against formset GUID
//
- if (IsZeroGuid (FormSetGuid) ||
+ if (IsZeroGuid (ComparingGuid) ||
CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {
break;
}
--
2.20.1.windows.1

Join devel@edk2.groups.io to automatically receive all group messages.