hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwayland: unset wlr_xwayland.server on destroy

Browse source 
This fixes a use-after-free in the Sway patch to filter the Xwayland
shell [1].

The server is destroyed first, then the shell. The Xwayland process
might still be using the shell while running.

When the shell is destroyed, libwayland will invoke the global
filter (to figure out whether to send a wl_registry.global_remove
to clients). Then Sway will compare the client with
wlr_xwayland_server.client. However, at that point, the server is
gone.

Reset the server to NULL so that Sway can check whether the server
is still running.

[1]: https://github.com/swaywm/sway/pull/7647
This commit is contained in:
Simon Ser 2023-06-22 16:28:43 +02:00
parent d59749aa44
commit 8714657d7b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwayland/xwayland.c
View file

@ -75,6 +75,7 @@ void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) {
wlr_xwayland_set_seat(xwayland, NULL); wlr_xwayland_set_seat(xwayland, NULL);
wlr_xwayland_server_destroy(xwayland->server); wlr_xwayland_server_destroy(xwayland->server);
xwayland->server = NULL;
wlr_xwayland_shell_v1_destroy(xwayland->shell_v1); wlr_xwayland_shell_v1_destroy(xwayland->shell_v1);
free(xwayland); free(xwayland);
} }