Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/PeiServicesLib/PeiServicesLib.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdePkg/Library/PeiServicesLib/PeiServicesLib.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/PeiServicesLib/PeiServicesLib.c

@@ -686 +686 @@
 
   FvInfoPpiDescriptor = AllocatePool (sizeof (EFI_PEI_PPI_DESCRIPTOR));
-  ASSERT (FvInfoPpiDescriptor != NULL);
+  if (FvInfoPpiDescriptor == NULL) {
+    ASSERT (FvInfoPpiDescriptor != NULL);
+    // Need to return here, FV may not be published, but we are out of resources anyway...
+    return;
+  }
 
   FvInfoPpiDescriptor->Guid  = PpiGuid;