tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos 

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>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Dandan Bi 2018-11-07 16:14:22 +08:00 committed by Liming Gao
parent 3eacb4751a
commit 8cd4e734cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
View File

@ -2882,6 +2882,7 @@ UiDisplayMenu (
// //
ControlFlag = CfUpdateHelpString; ControlFlag = CfUpdateHelpString;
ASSERT (NewPos != NULL);
UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue); UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);
if (SkipHighLight) { if (SkipHighLight) {
@ -2910,7 +2911,7 @@ UiDisplayMenu (
Temp2 = 0; Temp2 = 0;
} }
if (NewPos != NULL && (MenuOption == NULL || NewPos != &MenuOption->Link)) { if (MenuOption == NULL || NewPos != &MenuOption->Link) {
if (MenuOption != NULL) { if (MenuOption != NULL) {
// //
// Remove the old highlight menu. // Remove the old highlight menu.