Mesa (staging/18.2): wsi/wayland: only finish() a successfully init()ed display

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 9c7c711332fdc67fb65b044f74f378f08ae542e7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c7c711332fdc67fb65b044f74f378f08ae542e7

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Nov  5 09:57:09 2018 +0000

wsi/wayland: only finish() a successfully init()ed display

Fixes: 43691024982b3ea734ad0 "vulkan/wsi/wayland: Stop caching Wayland displays"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Philipp Zabel <p.zabel at pengutronix.de>
(cherry picked from commit d515ded4d951b830b560c352d64918a89027bee5)

---

 src/vulkan/wsi/wsi_common_wayland.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index a6d4f38558..aeff823f4d 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -456,7 +456,8 @@ wsi_wl_get_presentation_support(struct wsi_device *wsi_device,
 
    struct wsi_wl_display display;
    VkResult ret = wsi_wl_display_init(wsi, &display, wl_display, false);
-   wsi_wl_display_finish(&display);
+   if (ret == VK_SUCCESS)
+      wsi_wl_display_finish(&display);
 
    return ret == VK_SUCCESS;
 }