From: "Zeng, Star" <star.zeng@intel.com>
To: "Bi, Dandan" <dandan.bi@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Gao, Liming" <liming.gao@intel.com>,
"Dong, Eric" <eric.dong@intel.com>,
"Wu, Hao A" <hao.a.wu@intel.com>,
"Zeng, Star" <star.zeng@intel.com>
Subject: Re: [patch] MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos
Date: Thu, 8 Nov 2018 01:09:44 +0000 [thread overview]
Message-ID: <0C09AFA07DD0434D9E2A0C6AEB048310401EC2D7@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <20181107145311.42488-1-dandan.bi@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
-----Original Message-----
From: Bi, Dandan
Sent: Wednesday, November 7, 2018 10:53 PM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
Subject: [patch] MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1306
In function UiDisplayMenu, the NewPos ptr which used to point to the highlight menu entry. It will always point to the menu entry which need to be highlighted or the gMenuOption menu if the highlight menu is not found.
So we can remove the NULL ptr check for NewPos in this function.
And add the ASSERT code to avoid if any false positive reports of NULL pointer dereference issue raised from static analysis.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index 7390f954b6..44f087fe01 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -2880,10 +2880,11 @@ UiDisplayMenu (
// MenuOption is set to NULL in Repaint
// NewPos: Current menu option that need to hilight
//
ControlFlag = CfUpdateHelpString;
+ ASSERT (NewPos != NULL);
UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);
if (SkipHighLight) {
SkipHighLight = FALSE;
MenuOption = SavedMenuOption;
@@ -2908,11 +2909,11 @@ UiDisplayMenu (
Temp2 = SkipValue;
} else {
Temp2 = 0;
}
- if (NewPos != NULL && (MenuOption == NULL || NewPos != &MenuOption->Link)) {
+ if (MenuOption == NULL || NewPos != &MenuOption->Link) {
if (MenuOption != NULL) {
//
// Remove the old highlight menu.
//
Status = DisplayOneMenu (MenuOption,
--
2.18.0.windows.1
next prev parent reply other threads:[~2018-11-08 1:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 14:53 [patch] MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos Dandan Bi
2018-11-08 0:27 ` Gao, Liming
2018-11-08 1:09 ` Zeng, Star [this message]
2018-11-08 18:25 ` Ard Biesheuvel
2018-11-09 0:19 ` Gao, Liming
2018-11-09 6:56 ` Ard Biesheuvel
2018-11-09 10:49 ` Leif Lindholm
2018-11-09 11:01 ` Laszlo Ersek
2018-11-09 15:32 ` Gao, Liming
2018-11-09 16:01 ` Leif Lindholm
2018-11-09 16:33 ` Laszlo Ersek
2018-11-09 17:14 ` Kinney, Michael D
2018-11-09 17:24 ` Laszlo Ersek
2018-11-09 17:49 ` Kinney, Michael D
2018-11-09 20:07 ` Laszlo Ersek
2018-11-12 15:27 ` stephano
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=0C09AFA07DD0434D9E2A0C6AEB048310401EC2D7@shsmsx102.ccr.corp.intel.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