diff options
| author | Tudor Brindus <me@tbrindus.ca> | 2020-05-27 12:33:39 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-05-27 18:39:26 +0200 |
| commit | 59471606309b2f4f9b215dd0abd49f2af4b38abc (patch) | |
| tree | 74c890a9bfee3d6455278820cad5e46442087c95 | |
| parent | 15d8f1806e9debd11a1c306e76c97b535e708766 (diff) | |
xwayland: add error-checking to `server_start_lazy`
This prevents a very unlikely crash in `xwayland_socket_connected`.
Refs #2163.
| -rw-r--r-- | xwayland/server.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/xwayland/server.c b/xwayland/server.c index c8c5413a..3192e159 100644 --- a/xwayland/server.c +++ b/xwayland/server.c @@ -362,10 +362,18 @@ static int xwayland_socket_connected(int fd, uint32_t mask, void *data) { static bool server_start_lazy(struct wlr_xwayland_server *server) { struct wl_event_loop *loop = wl_display_get_event_loop(server->wl_display); - server->x_fd_read_event[0] = wl_event_loop_add_fd(loop, server->x_fd[0], - WL_EVENT_READABLE, xwayland_socket_connected, server); - server->x_fd_read_event[1] = wl_event_loop_add_fd(loop, server->x_fd[1], - WL_EVENT_READABLE, xwayland_socket_connected, server); + + if (!(server->x_fd_read_event[0] = wl_event_loop_add_fd(loop, server->x_fd[0], + WL_EVENT_READABLE, xwayland_socket_connected, server))) { + return false; + } + + if (!(server->x_fd_read_event[1] = wl_event_loop_add_fd(loop, server->x_fd[1], + WL_EVENT_READABLE, xwayland_socket_connected, server))) { + wl_event_source_remove(server->x_fd_read_event[0]); + server->x_fd_read_event[0] = NULL; + return false; + } return true; } |