From db1b42a438ee40104034ba3ee613f3799b5fcd07 Mon Sep 17 00:00:00 2001
From: Tom Cooper <tom.cooper@arm.com>
Date: Thu, 25 Jan 2018 14:07:53 +0000
Subject: Fix vkGetDeviceQueue2 segfault when returned vkQueue is
 VK_NULL_HANDLE

This affects the Loader.

Change-Id: I05a3feb87781be773f30327601a2bf86a53ae115
---
 loader/trampoline.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 6b0464d4..dff1ccd3 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -2506,7 +2506,10 @@ LOADER_EXPORT VKAPI_ATTR void VKAPI_CALL vkTrimCommandPool(
 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);
-    loader_set_dispatch(*pQueue, disp);
+    if (*pQueue != VK_NULL_HANDLE)
+    {
+        loader_set_dispatch(*pQueue, disp);
+    }
 }
 
 LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSamplerYcbcrConversion(
-- 
cgit v1.2.3