public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: nickle.wang@hpe.com
To: devel@edk2.groups.io, nickle.wang@hpe.com
Cc: dandan.bi@intel.com
Subject: [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT.
Date: Wed, 19 Feb 2020 22:22:40 +0800	[thread overview]
Message-ID: <20200219142240.10448-1-nickle.wang@hpe.com> (raw)

>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>
---
 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


             reply	other threads:[~2020-02-19 14:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-19 14:22 nickle.wang [this message]
2020-02-20  8:24 ` [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT Dandan Bi
2020-02-20 14:20   ` Liming Gao
2020-02-21  2:21     ` Nickle Wang
2020-02-21  2:23       ` Liming Gao
2020-02-21  2:25         ` Nickle Wang
2020-02-21  2:17   ` Nickle Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200219142240.10448-1-nickle.wang@hpe.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox