commit 40308ef6e5b71be30fb85ee1ac45796288cd8d0e
author Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Wed Jan 15 19:10:49 2025 +0100
committer Marge Bot <emma+marge@anholt.net> Tue Jan 21 14:33:14 2025 +0000
tree 231fd3c3ceac87b37e16395b4af8d3dee701bbde
parent 1021d6fe62d26383c2ff2f1b5745a308193bb064

egl/wayland: validate dri_screen_display_gpu before use

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12370
Fixes: d795b4712cb ("egl/wayland: only supply LINEAR modifier when supported")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33036>

src/egl/drivers/dri2/platform_wayland.c

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 9c60a89..1f66a92 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1224,12 +1224,13 @@
          render_modifiers = &linear_mod;
          render_num_modifiers = 1;
       }
-      if (dri2_dpy->dri_screen_display_gpu->base.screen->resource_create_with_modifiers) {
-         display_modifiers = &linear_mod;
-         display_num_modifiers = 1;
-      }
 
       if (dri2_dpy->dri_screen_display_gpu) {
+         if (dri2_dpy->dri_screen_display_gpu->base.screen->resource_create_with_modifiers) {
+            display_modifiers = &linear_mod;
+            display_num_modifiers = 1;
+         }
+
          linear_copy_display_gpu_image = dri_create_image_with_modifiers(
             dri2_dpy->dri_screen_display_gpu,
             dri2_surf->base.Width, dri2_surf->base.Height,