From 0c49559719cbcc9e070fa2199b278ebe1cd7d2db Mon Sep 17 00:00:00 2001
From: ocbuild <ocbuild@acidanthera.local>
Date: Wed, 12 Jan 2022 11:20:35 +0300
Subject: [PATCH] Svace: Fixed DEREF_OF_NULL.RET.LIB.PROC warning.

---
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 6fcd2be627..3eb4fb3f9c 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -2218,6 +2218,7 @@ XhcInitializeDeviceSlot (
   // 4) Allocate and initialize the Transfer Ring for the Default Control Endpoint.
   //
   EndpointTransferRing = AllocateZeroPool (sizeof (TRANSFER_RING));
+  ASSERT (EndpointTransferRing != NULL);
   Xhc->UsbDevContext[SlotId].EndpointTransferRing[0] = EndpointTransferRing;
   CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);
   //
@@ -2431,6 +2432,7 @@ XhcInitializeDeviceSlot64 (
   // 4) Allocate and initialize the Transfer Ring for the Default Control Endpoint.
   //
   EndpointTransferRing = AllocateZeroPool (sizeof (TRANSFER_RING));
+  ASSERT (EndpointTransferRing != NULL);
   Xhc->UsbDevContext[SlotId].EndpointTransferRing[0] = EndpointTransferRing;
   CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);
   //
@@ -2816,6 +2818,7 @@ XhcInitializeEndpointContext (
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {
           EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));
+          ASSERT (EndpointTransferRing != NULL);
           Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;
           CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);
           DEBUG ((DEBUG_INFO, "Endpoint[%x]: Created BULK ring [%p~%p)\n",
@@ -2889,6 +2892,7 @@ XhcInitializeEndpointContext (
 
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {
           EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));
+          ASSERT (EndpointTransferRing != NULL);
           Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;
           CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);
           DEBUG ((DEBUG_INFO, "Endpoint[%x]: Created INT ring [%p~%p)\n",
@@ -3008,6 +3012,7 @@ XhcInitializeEndpointContext64 (
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {
           EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));
+          ASSERT (EndpointTransferRing != NULL);
           Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;
           CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);
           DEBUG ((DEBUG_INFO, "Endpoint64[%x]: Created BULK ring [%p~%p)\n",
@@ -3081,6 +3086,7 @@ XhcInitializeEndpointContext64 (
 
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {
           EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));
+          ASSERT (EndpointTransferRing != NULL);
           Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;
           CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);
           DEBUG ((DEBUG_INFO, "Endpoint64[%x]: Created INT ring [%p~%p)\n",
@@ -4120,5 +4126,3 @@ XhcConfigHubContext64 (
   }
   return Status;
 }
-
-