MdeModulePkg PiSmmCore: Set ForwardLink to NULL in RemoveOldEntry()

[mirror_edk2.git] / MdeModulePkg / Core / PiSmmCore / Locate.c

diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/MdeModulePkg/Core/PiSmmCore/Locate.c
index ca95ee4e176f9a7d58390456a00849388266805b..c174a4dd03b8e513d23987f00aba9b45052f5b5b 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/MdeModulePkg/Core/PiSmmCore/Locate.c
@@ -1,7 +1,7 @@
 /** @file\r
   Locate handle functions\r
 \r
-  Copyright (c) 2009 - 2010, Intel Corporation.  All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are licensed and made available \r
   under the terms and conditions of the BSD License which accompanies this \r
   distribution.  The full text of the license may be found at        \r
@@ -205,14 +205,10 @@ SmmLocateProtocol (
   PROTOCOL_NOTIFY         *ProtNotify;\r
   IHANDLE                 *Handle;\r
 \r
-  if (Interface == NULL) {\r
+  if ((Interface == NULL) || (Protocol == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Protocol == NULL) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
   *Interface = NULL;\r
   Status = EFI_SUCCESS;\r
 \r
@@ -398,6 +394,7 @@ SmmLocateHandle (
     *BufferSize = ResultSize;\r
 \r
     if (SearchType == ByRegisterNotify && !EFI_ERROR(Status)) {\r
+      ASSERT (SearchKey != NULL);\r
       //\r
       // If this is a search by register notify and a handle was\r
       // returned, update the register notification position\r
@@ -429,7 +426,7 @@ SmmLocateHandle (
   @retval EFI_NOT_FOUND          No handles match the search.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enough pool memory to store the\r
                                  matching results.\r
-  @retval EFI_INVALID_PARAMETER  One or more paramters are not valid.\r
+  @retval EFI_INVALID_PARAMETER  One or more parameters are not valid.\r
 \r
 **/\r
 EFI_STATUS\r