The FrameworkHiiOnUefiHiiThunk driver registers notification for creating/adding/removing string/form packages into the UEFI HII Database. The notification handler wants to parse the IFR binary data of the form package. However, the code assumes that a form package have a FORM SET OP and if not, it will assert. Remove assert and ignore form packages that can not be handled for error tolerant.

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

2 files changed, 4 insertions, 2 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
index 5b32672..8a3f632 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
@@ -802,7 +802,6 @@ NewOrAddPackNotify (
     // Reparse the FormSet.

     //

     ThunkContext->FormSet = ParseFormSet (ThunkContext->UefiHiiHandle);

-    ASSERT (ThunkContext->FormSet != NULL);

   }

 

   return Status;  

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index e74830d..4610c90 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -894,7 +894,10 @@ ParseFormSet (
 

   CopyGuid (&FormSetGuid, &gZeroGuid);

   Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet);

-  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    FreePool (FormSet);

+    return NULL;

+  }

 

   return FormSet;

 }