MdeModulePkg/SmmCore: Fix memory leak on Profile unregistered.

Issue reported at bugzillar 445.

Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

diff --git a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
index 1e36039dd44350e4cfd9b0c4c0bf5970c058b736..ad3b54ace4285444f1b55875fe15ba7a1a996c9d 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
@@ -1186,7 +1186,9 @@ SmiHandlerProfileRegisterHandler (
 \r
   SmiEntry = SmmCoreFindHardwareSmiEntry (HandlerGuid, TRUE);\r
   if (SmiEntry == NULL) {\r
 \r
   SmiEntry = SmmCoreFindHardwareSmiEntry (HandlerGuid, TRUE);\r
   if (SmiEntry == NULL) {\r

-    FreePool (SmiHandler->Context);\r
+    if (SmiHandler->Context != NULL) {\r
+      FreePool (SmiHandler->Context);\r
+    }\r

     FreePool (SmiHandler);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
     FreePool (SmiHandler);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r


@@ -1277,6 +1279,9 @@ SmiHandlerProfileUnregisterHandler (
   SmiHandler = TargetSmiHandler;\r
 \r
   RemoveEntryList (&SmiHandler->Link);\r
   SmiHandler = TargetSmiHandler;\r
 \r
   RemoveEntryList (&SmiHandler->Link);\r

+  if (SmiHandler->Context != NULL) {\r
+    FreePool (SmiHandler->Context);\r
+  }\r

   FreePool (SmiHandler);\r
 \r
   if (IsListEmpty (&SmiEntry->SmiHandlers)) {\r
   FreePool (SmiHandler);\r
 \r
   if (IsListEmpty (&SmiEntry->SmiHandlers)) {\r