From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=dandan.bi@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 78AB12117D298 for ; Sat, 10 Nov 2018 15:32:42 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Nov 2018 15:32:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,489,1534834800"; d="scan'208";a="107032291" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 10 Nov 2018 15:32:41 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sat, 10 Nov 2018 15:32:41 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.84]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.199]) with mapi id 14.03.0415.000; Sun, 11 Nov 2018 07:32:39 +0800 From: "Bi, Dandan" To: "Gao, Liming" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos" Thread-Index: AQHUeP/pxeqRaxeR8k+ac+wCS+LKn6VJqI7A Date: Sat, 10 Nov 2018 23:32:39 +0000 Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB40183944@shsmsx102.ccr.corp.intel.com> References: <20181110141545.11944-1-liming.gao@intel.com> In-Reply-To: <20181110141545.11944-1-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGFjNDdjMGYtMDJhYy00MDJiLThmZTYtNjNiMmJiMzBjODU4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiM1o1UUdhbkFMekJCUEZjTEJISzc2K1Vsb2tSbDdwa0syR0pMeEt4SVhSTUU4Z3JjYmpQTDhBSW1FT09ZYW9nMCJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos" X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 23:32:42 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bi Dandan Thanks, Dandan > -----Original Message----- > From: Gao, Liming > Sent: Saturday, November 10, 2018 10:16 PM > To: edk2-devel@lists.01.org > Cc: Bi, Dandan > Subject: [Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless > NULL ptr check for NewPos" >=20 > This reverts commit 8cd4e734ccdfbc961c72aeaa8dbd3f5154171f9b. >=20 > It is not a real bug fix. It should not be pushed after Hard Feature Free= ze for > edk2-stable201811 tag. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Liming Gao > Cc: Dandan Bi > --- > MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > index 44f087fe01..7390f954b6 100644 > --- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > +++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c > @@ -2882,7 +2882,6 @@ UiDisplayMenu ( > // > ControlFlag =3D CfUpdateHelpString; >=20 > - ASSERT (NewPos !=3D NULL); > UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue); >=20 > if (SkipHighLight) { > @@ -2911,7 +2910,7 @@ UiDisplayMenu ( > Temp2 =3D 0; > } >=20 > - if (MenuOption =3D=3D NULL || NewPos !=3D &MenuOption->Link) { > + if (NewPos !=3D NULL && (MenuOption =3D=3D NULL || NewPos !=3D > + &MenuOption->Link)) { > if (MenuOption !=3D NULL) { > // > // Remove the old highlight menu. > -- > 2.13.0.windows.1