2 files changed, 4 insertions, 1 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 5aba4315ce..8f3ed5eb37 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -374,6 +374,8 @@ GatherDeviceInfo (
     for (Offset = PciIoDevice->SrIovCapabilityOffset + EFI_PCIE_CAPABILITY_ID_SRIOV_BAR0, BarIndex = 0;
          Offset <= PciIoDevice->SrIovCapabilityOffset + EFI_PCIE_CAPABILITY_ID_SRIOV_BAR5;
          BarIndex++) {
+
+      ASSERT (BarIndex < PCI_MAX_BAR);
       Offset = PciIovParseVfBar (PciIoDevice, Offset, BarIndex);
     }
   }
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index 17c864029b..4fea030687 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
@@ -1229,6 +1229,8 @@ ProgramBar (
   UINT64              Address;
   UINT32              Address32;
 
+  ASSERT (Node->Bar < PCI_MAX_BAR);
+
   //
   // Check VF BAR
   //
@@ -1249,7 +1251,6 @@ ProgramBar (
   //
   Node->PciDev->Allocated = TRUE;
 
-  ASSERT (Node->Bar < PCI_MAX_BAR);
   switch ((Node->PciDev->PciBar[Node->Bar]).BarType) {
 
   case PciBarTypeIo16: