From 49a7c92793ebcc4e2814ef295e51673dc4c9674c Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 15 Jul 2021 10:19:53 +0100 Subject: [PATCH] vulkan/wsi/wayland: Initialise wl_shm pointer in VkImage We don't explicitly calloc the wsi_wl_image to zero; anything that's expected to be valid needs to be explicitly initialised. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5063 Fixes: 6b36f35734a9 ("vulkan/wsi/wl: add wl_shm support for lavapipe.") Reviewed-by: Jason Ekstrand Reviewed-by: Dave Airlie Tested-by: Jan Beich Part-of: --- src/vulkan/wsi/wsi_common_wayland.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index cdafae13ee0..f7ecc85b248 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -1218,8 +1218,10 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface, /* Mark a bunch of stuff as NULL. This way we can just call * destroy_swapchain for cleanup. */ - for (uint32_t i = 0; i < num_images; i++) + for (uint32_t i = 0; i < num_images; i++) { chain->images[i].buffer = NULL; + chain->images[i].data_ptr = NULL; + } chain->surface = NULL; chain->frame = NULL;