Thanks Nickle for the fix. One minor comment is that please pay attention to the format of commit message. Refer to https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less than 76 characters when possible. Please address it when submit the patch. Reviewed-by: Dandan Bi <dandan...@intel.com>
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.w...@hpe.com > Cc: Bi, Dandan <dandan...@intel.com> > Subject: [edk2-devel] [PATCH] 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.w...@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 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54672): https://edk2.groups.io/g/devel/message/54672 Mute This Topic: https://groups.io/mt/71396770/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
