Commit 1f7ec57d3b963931a3f2febf6061d22614f1660c
2023-03-18T12:03:08
wayland: Unref the libdecor window when hiding Hiding the decorations while not unreferencing the frame was a workaround for an internal libdecor use-after-free bug that was fixed some time ago. Revert to unreferencing the window when hiding to ensure that it is properly destroyed. Reverts dd2e318
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 303f598..ff32308 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -1322,21 +1322,15 @@ void Wayland_ShowWindow(_THIS, SDL_Window *window)
/* Create the shell surface and map the toplevel/popup */
#ifdef HAVE_LIBDECOR_H
if (data->shell_surface_type == WAYLAND_SURFACE_LIBDECOR) {
- if (data->shell_surface.libdecor.frame) {
- /* If the frame already exists, just set the visibility. */
- libdecor_frame_set_visibility(data->shell_surface.libdecor.frame, true);
- libdecor_frame_set_app_id(data->shell_surface.libdecor.frame, c->classname);
+ data->shell_surface.libdecor.frame = libdecor_decorate(c->shell.libdecor,
+ data->surface,
+ &libdecor_frame_interface,
+ data);
+ if (data->shell_surface.libdecor.frame == NULL) {
+ SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Failed to create libdecor frame!");
} else {
- data->shell_surface.libdecor.frame = libdecor_decorate(c->shell.libdecor,
- data->surface,
- &libdecor_frame_interface,
- data);
- if (data->shell_surface.libdecor.frame == NULL) {
- SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Failed to create libdecor frame!");
- } else {
- libdecor_frame_set_app_id(data->shell_surface.libdecor.frame, c->classname);
- libdecor_frame_map(data->shell_surface.libdecor.frame);
- }
+ libdecor_frame_set_app_id(data->shell_surface.libdecor.frame, c->classname);
+ libdecor_frame_map(data->shell_surface.libdecor.frame);
}
} else
#endif
@@ -1540,8 +1534,8 @@ void Wayland_HideWindow(_THIS, SDL_Window *window)
#ifdef HAVE_LIBDECOR_H
if (wind->shell_surface_type == WAYLAND_SURFACE_LIBDECOR) {
if (wind->shell_surface.libdecor.frame) {
- libdecor_frame_set_visibility(wind->shell_surface.libdecor.frame, false);
- libdecor_frame_set_app_id(wind->shell_surface.libdecor.frame, data->classname);
+ libdecor_frame_unref(wind->shell_surface.libdecor.frame);
+ wind->shell_surface.libdecor.frame = NULL;
}
} else
#endif