commit 3336e65e880101e28b38836733c1f02fd9214bf2
author Lenny Komow <lenny@lunarg.com> Fri Apr 24 10:14:48 2020 -0600
committer Lenny Komow <lenny@lunarg.com> Fri Apr 24 11:13:12 2020 -0600
tree 25a5aa8d93d5bb2c59820956d577f35cf62a85db
parent 4fb0e0374a3912263606d9ed0243bbef22e23597

loader: Check for null when creating a queue

Without a null check when creating a queue, it becomes impossible to
test for the case where the provided queue is null. Normally I would
prefer to check the return code, but these functions are void return.

Change-Id: I391be85526944b4d39377cfc33545e74c1ce327d

loader/trampoline.c

diff --git a/loader/trampoline.c b/loader/trampoline.c
index ea17552..bd33034 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -864,7 +864,9 @@
     disp = loader_get_dispatch(device);
 
     disp->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue);
-    loader_set_dispatch(*pQueue, disp);
+    if (pQueue != NULL) {
+        loader_set_dispatch(*pQueue, disp);
+    }
 }
 
 LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits,
@@ -2450,8 +2452,7 @@
 LOADER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) {
     const VkLayerDispatchTable *disp = loader_get_dispatch(device);
     disp->GetDeviceQueue2(device, pQueueInfo, pQueue);
-    if (*pQueue != VK_NULL_HANDLE)
-    {
+    if (pQueue != NULL) {
         loader_set_dispatch(*pQueue, disp);
     }
 }