[Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos"

[Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos"

[Liming Gao]

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>
---
 MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c | 3 +--
 1 file changed, 1 insertion(+), 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.
-- 
2.13.0.windows.1

Re: [Patch] Revert "MdeModulePkg/DisplayEngine: Remove useless NULL ptr check for NewPos"

[Bi, Dandan]

Reviewed-by: Bi Dandan <dandan.bi@intel.com>

Thanks,
Dandan

> -----Original Message-----
> From: Gao, Liming
> Sent: Saturday, November 10, 2018 10:16 PM
> To: edk2-devel@lists.01.org
> Cc: Bi, Dandan <dandan.bi@intel.com>
> Subject: [Patch] 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>
> ---
>  MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c | 3 +--
>  1 file changed, 1 insertion(+), 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.
> --
> 2.13.0.windows.1