2
0
Эх сурвалжийг харах

wayland: Check the returned display value for null

In reality, this condition will never occur, since the index is checked before calling the display retrieval function, but aggressive LTO with jump threading can generate a warning if this isn't explicitly checked.

(cherry picked from commit 91bb1bb6fd042677c2725a1c9e6e99cb71dda247)
Frank Praznik 7 сар өмнө
parent
commit
43e9c5b247

+ 5 - 0
src/video/wayland/SDL_waylandvideo.c

@@ -644,6 +644,11 @@ static void display_handle_done(void *data,
 
     if (driverdata->index > -1) {
         dpy = SDL_GetDisplay(driverdata->index);
+
+        /* XXX: This can never happen, but jump threading during aggressive LTO can generate a warning without this check. */
+        if (!dpy) {
+            dpy = &driverdata->placeholder;
+        }
     } else {
         dpy = &driverdata->placeholder;
     }