[VP] Fix coverity issue for heap manager

Fix coverity issue for heap manager: logically dead code
intel · Jul 18, 2024 · 6f2977f · 6f2977f
1 parent 76260ff
commit 6f2977f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/media_softlet/agnostic/common/renderhal/renderhal.cpp b/media_softlet/agnostic/common/renderhal/renderhal.cpp
@@ -1430,8 +1430,25 @@ MOS_STATUS RenderHal_AllocateStateHeaps(
         if (!pStateHeap->surfaceStateMgr)
         {
             pStateHeap->surfaceStateMgr = MOS_New(SurfaceStateHeapManager, pRenderHal->pOsInterface);
-            MHW_RENDERHAL_CHK_NULL_RETURN(pStateHeap->surfaceStateMgr);
-            MHW_RENDERHAL_CHK_STATUS_RETURN(pStateHeap->surfaceStateMgr->CreateHeap(pRenderHal->pRenderHalPltInterface->GetSurfaceStateCmdSize()));
+            if (pStateHeap->surfaceStateMgr == nullptr)
+            {
+                MHW_RENDERHAL_ASSERTMESSAGE("Fail to Allocate SSH manager.");
+                // Free State Heap control structure
+                MOS_AlignedFreeMemory(pStateHeap);
+                pRenderHal->pStateHeap = nullptr;
+                return MOS_STATUS_NULL_POINTER;
+            }
+
+            eStatus                          = pStateHeap->surfaceStateMgr->CreateHeap(pRenderHal->pRenderHalPltInterface->GetSurfaceStateCmdSize());
+            if (eStatus != MOS_STATUS_SUCCESS)
+            {
+                MHW_RENDERHAL_ASSERTMESSAGE("Fail to Allocate SSH manager.");
+                MHW_RENDERHAL_CHK_STATUS_RETURN(pStateHeap->surfaceStateMgr->DestroyHeap());
+                // Free State Heap control structure
+                MOS_AlignedFreeMemory(pStateHeap);
+                pRenderHal->pStateHeap = nullptr;
+                return eStatus;
+            }
             pStateHeap->iCurrentSurfaceState = pStateHeap->surfaceStateMgr->m_surfStateHeap->uiCurState;
         }
     }

diff --git a/media_softlet/agnostic/common/renderhal/surface_state_heap_mgr.cpp b/media_softlet/agnostic/common/renderhal/surface_state_heap_mgr.cpp
@@ -99,10 +99,6 @@ MOS_STATUS SurfaceStateHeapManager::CreateHeap(size_t surfStateSize)
         (uint32_t *)(m_surfStateHeap->pLockedOsResourceMem +
                      m_surfStateHeap->uiOffsetSync);
 
-    if (eStatus != MOS_STATUS_SUCCESS)
-    {
-        DestroyHeap();
-    }
     return eStatus;
 }