OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/wsi: Fix stack-use-after-scope in x11_surface_create_swapchain

Browse Source 
drm_image_params and num_modifiers are used outside the if-scope as
wsi_swapchain_init argument.

Fixes: 8f6fca89aa ("meson: delete dri3 build option")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31036>
This commit is contained in:
David Rosca
2024-09-05 09:30:35 +02:00
committed by Marge Bot
parent 63781071db
commit af8c680087
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vulkan/wsi/wsi_common_x11.c
View File

@@ -2620,6 +2620,10 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
}
#endif
#ifdef HAVE_X11_DRM
struct wsi_drm_image_params drm_image_params;
uint32_t num_modifiers[2] = {0, 0};
#endif
struct wsi_base_image_params *image_params = NULL;
struct wsi_cpu_image_params cpu_image_params;
uint64_t *modifiers[2] = {NULL, NULL};
@@ -2631,8 +2635,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
image_params = &cpu_image_params.base;
} else {
#ifdef HAVE_X11_DRM
uint32_t num_modifiers[2] = {0, 0};
struct wsi_drm_image_params drm_image_params = {
drm_image_params = (struct wsi_drm_image_params) {
.base.image_type = WSI_IMAGE_TYPE_DRM,
.same_gpu = wsi_x11_check_dri3_compatible(wsi_device, conn),
.explicit_sync =