From a4b67f664e6a52898e681b35ca769e1fd206a4d1 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 9 Nov 2016 10:21:03 -0800 Subject: vulkan/wsi/wayland: Clean up some error handling paths This gets rid of all the memory leaks reported by the WSI CTS tests. Signed-off-by: Jason Ekstrand Reviewed-by: Dave Airlie Cc: "13.0" (cherry picked from commit 302f641d14f5c4d1560b6a0170803e21bd4bb976) --- src/vulkan/wsi/wsi_common_wayland.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 79f7e967345..a61b74d6f2d 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -322,6 +322,8 @@ wsi_wl_get_display(struct wsi_device *wsi_device, pthread_mutex_unlock(&wsi->mutex); struct wsi_wl_display *display = wsi_wl_display_create(wsi, wl_display); + if (!display) + return NULL; pthread_mutex_lock(&wsi->mutex); @@ -398,6 +400,8 @@ wsi_wl_surface_get_formats(VkIcdSurfaceBase *icd_surface, VkIcdSurfaceWayland *surface = (VkIcdSurfaceWayland *)icd_surface; struct wsi_wl_display *display = wsi_wl_get_display(wsi_device, surface->display); + if (!display) + return VK_ERROR_OUT_OF_HOST_MEMORY; uint32_t count = u_vector_length(&display->formats); @@ -827,6 +831,10 @@ wsi_wl_finish_wsi(struct wsi_device *wsi_device, (struct wsi_wayland *)wsi_device->wsi[VK_ICD_WSI_PLATFORM_WAYLAND]; if (wsi) { + struct hash_entry *entry; + hash_table_foreach(wsi->displays, entry) + wsi_wl_display_destroy(wsi, entry->data); + _mesa_hash_table_destroy(wsi->displays, NULL); pthread_mutex_destroy(&wsi->mutex); -- cgit v1.2.3