From 251779fca719bf9ea00505ee7629c08b452c150d Mon Sep 17 00:00:00 2001
From: Jiewen Yao <jiewen.yao@intel.com>
Date: Mon, 27 Mar 2017 23:01:02 +0800
Subject: [PATCH] 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>
---
 MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
index 1e36039dd4..ad3b54ace4 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
@@ -1186,7 +1186,9 @@ SmiHandlerProfileRegisterHandler (
 
   SmiEntry = SmmCoreFindHardwareSmiEntry (HandlerGuid, TRUE);
   if (SmiEntry == NULL) {
-    FreePool (SmiHandler->Context);
+    if (SmiHandler->Context != NULL) {
+      FreePool (SmiHandler->Context);
+    }
     FreePool (SmiHandler);
     return EFI_OUT_OF_RESOURCES;
   }
@@ -1277,6 +1279,9 @@ SmiHandlerProfileUnregisterHandler (
   SmiHandler = TargetSmiHandler;
 
   RemoveEntryList (&SmiHandler->Link);
+  if (SmiHandler->Context != NULL) {
+    FreePool (SmiHandler->Context);
+  }
   FreePool (SmiHandler);
 
   if (IsListEmpty (&SmiEntry->SmiHandlers)) {