diff options
| author | Liming Gao <liming.gao@intel.com> | 2018-11-10 22:06:39 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-11-11 11:42:36 +0800 |
| commit | 114a75ad8694046372d4892d0d5e59b4088b2885 (patch) | |
| tree | 0a9d2caee9f9d700e34a142f3d3b184da66e4424 /MdeModulePkg | |
| parent | e9ab1635a2cfa1cb588996dcd5cc157fb44decb1 (diff) | |
| download | edk2-114a75ad8694046372d4892d0d5e59b4088b2885.tar.gz edk2-114a75ad8694046372d4892d0d5e59b4088b2885.tar.bz2 edk2-114a75ad8694046372d4892d0d5e59b4088b2885.zip | |
Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos"
This reverts commit 8cd4e734ccdfbc961c72aeaa8dbd3f5154171f9b.
It is not a real bug fix. It should not be pushed after
Hard Feature Freeze for edk2-stable201811 tag.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Bi Dandan <dandan.bi@intel.com>
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 = CfUpdateHelpString;
- ASSERT (NewPos != NULL);
UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);
if (SkipHighLight) {
@@ -2911,7 +2910,7 @@ UiDisplayMenu ( Temp2 = 0;
}
- if (MenuOption == NULL || NewPos != &MenuOption->Link) {
+ if (NewPos != NULL && (MenuOption == NULL || NewPos != &MenuOption->Link)) {
if (MenuOption != NULL) {
//
// Remove the old highlight menu.
|