From 4cac78bb3cc6f9d2863663c00e1e8fdc2950bfa5 Mon Sep 17 00:00:00 2001
From: Silvio Vilerino <sivileri@microsoft.com>
Date: Tue, 7 Apr 2026 12:08:00 -0400
Subject: [PATCH] mediafoundation: MFTRegisterWorkQueue/MFTUnregisterWorkQueue
 to validate null param instead of crash

Reviewed-by: Pohsiang (John) Hsu <pohhsu@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40860>
---
 src/gallium/frontends/mediafoundation/mfd3dmanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/frontends/mediafoundation/mfd3dmanager.cpp b/src/gallium/frontends/mediafoundation/mfd3dmanager.cpp
index d0ccc85bd7f..f42f58f00e0 100644
--- a/src/gallium/frontends/mediafoundation/mfd3dmanager.cpp
+++ b/src/gallium/frontends/mediafoundation/mfd3dmanager.cpp
@@ -290,7 +290,8 @@ MFTRegisterWorkQueue( struct d3d12_context_queue_priority_manager *manager, ID3D
    mtx_lock( &mft_mgr->m_lock );
 
    ComPtr<IUnknown> queue_unknown;
-   if( FAILED( queue->QueryInterface( IID_PPV_ARGS( &queue_unknown ) ) ) )
+   if( !queue ||
+       FAILED( queue->QueryInterface( IID_PPV_ARGS( &queue_unknown ) ) ) )
    {
       mtx_unlock( &mft_mgr->m_lock );
       return -1;
@@ -318,7 +319,8 @@ MFTUnregisterWorkQueue( struct d3d12_context_queue_priority_manager *manager, ID
    mtx_lock( &mft_mgr->m_lock );
 
    ComPtr<IUnknown> queue_unknown;
-   if( FAILED( queue->QueryInterface( IID_PPV_ARGS( &queue_unknown ) ) ) )
+   if( !queue ||
+       FAILED( queue->QueryInterface( IID_PPV_ARGS( &queue_unknown ) ) ) )
    {
       mtx_unlock( &mft_mgr->m_lock );
       return -1;