Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.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/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c

@@ -185 +185 @@
 
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);
-  ASSERT (PciRootBridgeIo != NULL);
+
+  if (PciRootBridgeIo == NULL) {
+    ASSERT (PciRootBridgeIo != NULL);
+    return 0;
+  }
 
   PciRootBridgeIo->Pci.Read (
@@ -224 +228 @@
 
   PciRootBridgeIo = PciSegmentLibSearchForRootBridge (Address);
-  ASSERT (PciRootBridgeIo != NULL);
+
+  if (PciRootBridgeIo == NULL) {
+    ASSERT (PciRootBridgeIo != NULL);
+    return 0;
+  }
 
   PciRootBridgeIo->Pci.Write (