nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: fix double free wlr_xwayland_shell_v1

Browse Source
This commit is contained in:
JiDe Zhang 2023-09-08 21:36:56 +08:00 committed by Simon Ser
parent e58c7bb792
commit ca19014af0
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/xwayland/shell.h
View File

@ -21,6 +21,7 @@ struct wlr_xwayland_shell_v1 {
struct wl_global *global; struct wl_global *global;
struct { struct {
struct wl_signal destroy;
struct wl_signal new_surface; // struct wlr_xwayland_surface_v1 struct wl_signal new_surface; // struct wlr_xwayland_surface_v1
} events; } events;

1
include/wlr/xwayland/xwayland.h
View File

@ -49,6 +49,7 @@ struct wlr_xwayland {
struct wl_listener server_ready; struct wl_listener server_ready;
struct wl_listener server_destroy; struct wl_listener server_destroy;
struct wl_listener seat_destroy; struct wl_listener seat_destroy;
struct wl_listener shell_destroy;
void *data; void *data;
}; };

3
xwayland/shell.c
View File

@ -179,6 +179,7 @@ struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create(
wl_list_init(&shell->surfaces); wl_list_init(&shell->surfaces);
wl_signal_init(&shell->events.new_surface); wl_signal_init(&shell->events.new_surface);
wl_signal_init(&shell->events.destroy);
shell->display_destroy.notify = handle_display_destroy; shell->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &shell->display_destroy); wl_display_add_destroy_listener(display, &shell->display_destroy);
@ -193,6 +194,8 @@ void wlr_xwayland_shell_v1_destroy(struct wlr_xwayland_shell_v1 *shell) {
return; return;
} }
wl_signal_emit_mutable(&shell->events.destroy, NULL);
struct wlr_xwayland_surface_v1 *xwl_surface, *tmp; struct wlr_xwayland_surface_v1 *xwl_surface, *tmp;
wl_list_for_each_safe(xwl_surface, tmp, &shell->surfaces, link) { wl_list_for_each_safe(xwl_surface, tmp, &shell->surfaces, link) {
xwl_surface_destroy(xwl_surface); xwl_surface_destroy(xwl_surface);

10
xwayland/xwayland.c
View File

@ -63,6 +63,12 @@ static void handle_server_ready(struct wl_listener *listener, void *data) {
wl_signal_emit_mutable(&xwayland->events.ready, NULL); wl_signal_emit_mutable(&xwayland->events.ready, NULL);
} }
static void handle_shell_destroy(struct wl_listener *listener, void *data) {
struct wlr_xwayland *xwayland =
wl_container_of(listener, xwayland, shell_destroy);
xwayland->shell_v1 = NULL;
}
void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) { void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) {
if (!xwayland) { if (!xwayland) {
return; return;
@ -71,6 +77,7 @@ void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) {
wl_list_remove(&xwayland->server_destroy.link); wl_list_remove(&xwayland->server_destroy.link);
wl_list_remove(&xwayland->server_start.link); wl_list_remove(&xwayland->server_start.link);
wl_list_remove(&xwayland->server_ready.link); wl_list_remove(&xwayland->server_ready.link);
wl_list_remove(&xwayland->shell_destroy.link);
free(xwayland->cursor); free(xwayland->cursor);
wlr_xwayland_set_seat(xwayland, NULL); wlr_xwayland_set_seat(xwayland, NULL);
@ -125,6 +132,9 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
xwayland->server_ready.notify = handle_server_ready; xwayland->server_ready.notify = handle_server_ready;
wl_signal_add(&xwayland->server->events.ready, &xwayland->server_ready); wl_signal_add(&xwayland->server->events.ready, &xwayland->server_ready);
xwayland->shell_destroy.notify = handle_shell_destroy;
wl_signal_add(&xwayland->shell_v1->events.destroy, &xwayland->shell_destroy);
return xwayland; return xwayland;
} }