From 215787e8b28d4e52d97bdcadd4b64305c7a62ac5 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 19 Oct 2021 07:50:05 +0200 Subject: [PATCH] xwayland: Clear wlr_xwayland_surface in handle_destroy If the destroyed xwayland view is in transaction, it won't be destroyed immediately. wlr_xwayland_surface then becomes dangling pointer. Closes #6605 Closes #5884 --- sway/desktop/xwayland.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 1af8d2484..40288f973 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -436,6 +436,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&xwayland_view->commit.link); } + xwayland_view->view.wlr_xwayland_surface = NULL; + wl_list_remove(&xwayland_view->destroy.link); wl_list_remove(&xwayland_view->request_configure.link); wl_list_remove(&xwayland_view->request_fullscreen.link);