From 05f13335ec4d98f0df7e04d896b0b631e9d557b8 Mon Sep 17 00:00:00 2001 From: Quantum Date: Tue, 26 May 2020 18:07:13 -0400 Subject: [PATCH] xwayland_socket_connected: avoid calling wl_event_source_remove on NULL This should fix #2163. --- xwayland/server.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xwayland/server.c b/xwayland/server.c index c8c5413a4..84563acef 100644 --- a/xwayland/server.c +++ b/xwayland/server.c @@ -351,8 +351,12 @@ static bool server_start(struct wlr_xwayland_server *server) { static int xwayland_socket_connected(int fd, uint32_t mask, void *data) { struct wlr_xwayland_server *server = data; - wl_event_source_remove(server->x_fd_read_event[0]); - wl_event_source_remove(server->x_fd_read_event[1]); + if (server->x_fd_read_event[0]) { + wl_event_source_remove(server->x_fd_read_event[0]); + } + if (server->x_fd_read_event[1]) { + wl_event_source_remove(server->x_fd_read_event[1]); + } server->x_fd_read_event[0] = server->x_fd_read_event[1] = NULL; server_start(server);