From 51686a7a294191a5ea87dc89b3167b01297ee6b0 Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Fri, 22 Jul 2016 10:08:01 +0800
Subject: ShellPkg: Fix a potential NULL pointer deference issue

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
---
 ShellPkg/Application/Shell/ShellProtocol.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ShellPkg/Application/Shell')

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index c3331def82..55a1e43f06 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -3699,8 +3699,10 @@ CreatePopulateInstallShellProtocol (
                                );
       if (!EFI_ERROR(Status)) {
         OldProtocolNode = AllocateZeroPool(sizeof(SHELL_PROTOCOL_HANDLE_LIST));
-        if (OldProtocolNode == NULL && !IsListEmpty (&ShellInfoObject.OldShellList.Link)) {
-          CleanUpShellProtocol (&mShellProtocol);
+        if (OldProtocolNode == NULL) {
+          if (!IsListEmpty (&ShellInfoObject.OldShellList.Link)) {
+            CleanUpShellProtocol (&mShellProtocol);
+          }
           Status = EFI_OUT_OF_RESOURCES;
           break;
         }
-- 
cgit v1.2.3