blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: add error-checking to `server_start_lazy` 

This prevents a very unlikely crash in `xwayland_socket_connected`.

Refs #2163.
This commit is contained in:
Tudor Brindus 2020-05-27 12:33:39 -04:00 committed by Simon Ser
parent 15d8f1806e
commit 5947160630
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xwayland/server.c
View File

@ -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) { static bool server_start_lazy(struct wlr_xwayland_server *server) {
struct wl_event_loop *loop = wl_display_get_event_loop(server->wl_display); 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); if (!(server->x_fd_read_event[0] = wl_event_loop_add_fd(loop, server->x_fd[0],
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_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; return true;
} }