Mesa (18.2): vulkan/wsi/display: check if wsi_swapchain_init() succeeded

[GitLab Mirror]

Module: Mesa
Branch: 18.2
Commit: 18913d2aaefe7a27e71dac64c35edd564c8fd790
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18913d2aaefe7a27e71dac64c35edd564c8fd790

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Sep 13 20:36:15 2018 +0100

vulkan/wsi/display: check if wsi_swapchain_init() succeeded

Fixes: da997ebec929421939553 "vulkan: Add KHR_display extension using DRM [v10]"
Cc: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit bde3102c0dc3e33d2605d013205e381ff6d93ace)

---

 src/vulkan/wsi/wsi_common_display.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c
index b47a06fe54..65a4038b8d 100644
--- a/src/vulkan/wsi/wsi_common_display.c
+++ b/src/vulkan/wsi/wsi_common_display.c
@@ -1712,6 +1712,10 @@ wsi_display_surface_create_swapchain(
 
    VkResult result = wsi_swapchain_init(wsi_device, &chain->base, device,
                                         create_info, allocator);
+   if (result != VK_SUCCESS) {
+      vk_free(allocator, chain);
+      return result;
+   }
 
    chain->base.destroy = wsi_display_swapchain_destroy;
    chain->base.get_wsi_image = wsi_display_get_wsi_image;