public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [patch] MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos
@ 2018-11-07 14:53 Dandan Bi
  2018-11-08  0:27 ` Gao, Liming
  2018-11-08  1:09 ` Zeng, Star
  0 siblings, 2 replies; 16+ messages in thread
From: Dandan Bi @ 2018-11-07 14:53 UTC (permalink / raw)
  To: edk2-devel; +Cc: Liming Gao, Eric Dong, Star Zeng, Hao Wu

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



^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2018-11-12 15:27 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox