Mesa (master): vulkan/overlay: fix crash on destroying NULL swapchain

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ec7b55f4cc5dd3dc61eb6b9e51f46c58a2a896d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec7b55f4cc5dd3dc61eb6b9e51f46c58a2a896d3

Author: Pavel Asyutchenko <sventeam at yandex.ru>
Date:   Tue Jun 23 23:10:38 2020 +0300

vulkan/overlay: fix crash on destroying NULL swapchain

Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5616>

---

 src/vulkan/overlay-layer/overlay.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vulkan/overlay-layer/overlay.cpp b/src/vulkan/overlay-layer/overlay.cpp
index 1ed1d2b02e7..c415d6a8205 100644
--- a/src/vulkan/overlay-layer/overlay.cpp
+++ b/src/vulkan/overlay-layer/overlay.cpp
@@ -1861,6 +1861,12 @@ static void overlay_DestroySwapchainKHR(
     VkSwapchainKHR                              swapchain,
     const VkAllocationCallbacks*                pAllocator)
 {
+   if (swapchain == VK_NULL_HANDLE) {
+      struct device_data *device_data = FIND(struct device_data, device);
+      device_data->vtable.DestroySwapchainKHR(device, swapchain, pAllocator);
+      return;
+   }
+
    struct swapchain_data *swapchain_data =
       FIND(struct swapchain_data, swapchain);