The FrameworkHiiOnUefiHiiThunk driver registers notification for creating/adding...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8874 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
index 5b326721ba512a9ec73980b40c8b8a19adbce5d8..8a3f632bf44322d530040081f7583b1ded0a78eb 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
@@ -802,7 +802,6 @@ NewOrAddPackNotify (
     // Reparse the FormSet.\r
     //\r
     ThunkContext->FormSet = ParseFormSet (ThunkContext->UefiHiiHandle);\r
-    ASSERT (ThunkContext->FormSet != NULL);\r
   }\r
 \r
   return Status;  \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index e74830de56b124c5bce82df42a6d62009d8d7955..4610c90deca5168fad26984fe75f185efd30f886 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -894,7 +894,10 @@ ParseFormSet (
 \r
   CopyGuid (&FormSetGuid, &gZeroGuid);\r
   Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet);\r
-  ASSERT_EFI_ERROR (Status);\r
+  if (EFI_ERROR (Status)) {\r
+    FreePool (FormSet);\r
+    return NULL;\r
+  }\r
 \r
   return FormSet;\r
 }\r