vkGetDeviceQueue2: add a NULL check
The current driver::GetDeviceQueue2() will indeed crash if the
driver returns a NULL queue, which it is supposed to do if the
pQueueInfo->flags doesn't match the flags requested for the queue
family. Thus need to add a NULL check for pQueue here in case.
Test: deqp vulkancts test
Bug: b/72867433
Change-Id: I306c1a1db52a9986801357eaeb357536ecb0428e
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index c8e7bd9..1fceb4a 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -1170,7 +1170,8 @@
const auto& data = GetData(device);
data.driver.GetDeviceQueue2(device, pQueueInfo, pQueue);
- SetData(*pQueue, data);
+ if (pQueue != VK_NULL_HANDLE)
+ SetData(*pQueue, data);
}
VKAPI_ATTR VkResult