diff options
| author | Nickle Wang <nickle.wang@hpe.com> | 2020-02-21 09:56:45 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-03-12 05:20:12 +0000 |
| commit | 7d325f93e190cbbb7bc58f1b994d314b53fe8668 (patch) | |
| tree | 4628fb97845e679fa5dcc231906abf2d9d36523f | |
| parent | 64a228f5f89320fd632bb6c55e154961f2410680 (diff) | |
| download | edk2-7d325f93e190cbbb7bc58f1b994d314b53fe8668.tar.gz edk2-7d325f93e190cbbb7bc58f1b994d314b53fe8668.tar.bz2 edk2-7d325f93e190cbbb7bc58f1b994d314b53fe8668.zip | |
MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT.
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@hpe.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
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;
}
|