From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.2768.1582187047714124663 for ; Thu, 20 Feb 2020 00:24:07 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: dandan.bi@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Feb 2020 00:24:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,463,1574150400"; d="scan'208";a="408717894" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga005.jf.intel.com with ESMTP; 20 Feb 2020 00:24:06 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 20 Feb 2020 00:24:06 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 20 Feb 2020 00:24:06 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.5]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.222]) with mapi id 14.03.0439.000; Thu, 20 Feb 2020 16:24:04 +0800 From: "Dandan Bi" To: "devel@edk2.groups.io" , "nickle.wang@hpe.com" Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Thread-Topic: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Thread-Index: AQHV5zAx2Jw2fAGhuEKzNrMrvNSnpagjvexg Date: Thu, 20 Feb 2020 08:24:04 +0000 Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB40D4473F@SHSMSX104.ccr.corp.intel.com> References: <20200219142240.10448-1-nickle.wang@hpe.com> In-Reply-To: <20200219142240.10448-1-nickle.wang@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: dandan.bi@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks Nickle for the fix. One minor comment is that please pay attention to the format of commit mes= sage. Refer to https://github.com/tianocore/tianocore.github.io/wiki/Commit-Mes= sage-Format, Line length of commit message should be less than 76 character= s when possible. Please address it when submit the patch. Reviewed-by: Dandan Bi Thanks, Dandan > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Nickle Wang > Sent: Wednesday, February 19, 2020 10:23 PM > To: devel@edk2.groups.io; nickle.wang@hpe.com > Cc: Bi, Dandan > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > IsZeroGuid() ASSERT. >=20 > From the function description of GetIfrBinaryData(), FormSetGuid can be > NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > exception when FormSetGuid is NULL. >=20 > Signed-off-by: Nickle Wang > --- > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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. >=20 > Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
> +(C) Copyright 2020 Hewlett Packard Enterprise Development LP
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > // > // Try to compare against formset GUID > // > - if (IsZeroGuid (FormSetGuid) || > + if (IsZeroGuid (ComparingGuid) || > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + siz= eof > (EFI_IFR_OP_HEADER)))) { > break; > } > -- > 2.20.1.windows.1 >=20 >=20 >=20