X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FFrontPage.c;h=55fce979f781cf8f2ff961ee6ac0f83cac58e07e;hp=9f25ebca6b154157c221a3bc6e672befaf3fdb34;hb=b55f8b0146ab1a0b26909a63bb04ba850b9ba198;hpb=aeddd42532529a3701dc9f9a4f78005c075bc0d6

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 9f25ebca6b..55fce979f7 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -721,6 +721,9 @@ UpdateFrontPageStrings (
   Record          = NULL;
   do {
     Status = DataHub->GetNextRecord (DataHub, &MonotonicCount, NULL, &Record);
+    if (EFI_ERROR (Status) || Record == NULL) {
+      break;
+    }
     if (Record->DataRecordClass == EFI_DATA_RECORD_CLASS_DATA) {
       DataHeader = (EFI_SUBCLASS_TYPE1_HEADER *) (Record + 1);
       if (CompareGuid (&Record->DataRecordGuid, &gEfiMiscSubClassGuid) &&