diff options
| author | Tom Cooper <tom.cooper@arm.com> | 2018-01-25 14:07:53 +0000 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2018-03-09 13:54:31 -0700 |
| commit | db1b42a438ee40104034ba3ee613f3799b5fcd07 (patch) | |
| tree | 4d31da2be84e55b14cab716a261452142e8b8ec5 | |
| parent | 4df1d6e03c91637d89d70339674deaece0d7641e (diff) | |
| download | usermoji-db1b42a438ee40104034ba3ee613f3799b5fcd07.tar.xz | |
Fix vkGetDeviceQueue2 segfault when returned vkQueue is VK_NULL_HANDLE
This affects the Loader.
Change-Id: I05a3feb87781be773f30327601a2bf86a53ae115
| -rw-r--r-- | loader/trampoline.c | 5 |
1 files changed, 4 insertions, 1 deletions
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( |