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

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: a835329bb72c7ce9c099ce1ab37126ed596408b5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a835329bb72c7ce9c099ce1ab37126ed596408b5

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>
(cherry picked from commit ec7b55f4cc5dd3dc61eb6b9e51f46c58a2a896d3)

---

 .pick_status.json                    | 2 +-
 src/vulkan/overlay-layer/overlay.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 310aa12bbcb..ba0d8d9514f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -751,7 +751,7 @@
         "description": "vulkan/overlay: fix crash on destroying NULL swapchain",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
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);