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
This commit is contained in:
rsun3 2009-07-10 10:13:04 +00:00
parent ada3f18c41
commit 904ac28c0e
2 changed files with 4 additions and 2 deletions

View File

@ -802,7 +802,6 @@ NewOrAddPackNotify (
// Reparse the FormSet. // Reparse the FormSet.
// //
ThunkContext->FormSet = ParseFormSet (ThunkContext->UefiHiiHandle); ThunkContext->FormSet = ParseFormSet (ThunkContext->UefiHiiHandle);
ASSERT (ThunkContext->FormSet != NULL);
} }
return Status; return Status;

View File

@ -894,7 +894,10 @@ ParseFormSet (
CopyGuid (&FormSetGuid, &gZeroGuid); CopyGuid (&FormSetGuid, &gZeroGuid);
Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet); Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet);
ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) {
FreePool (FormSet);
return NULL;
}
return FormSet; return FormSet;
} }