mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dangling file descriptors (fixes #1152)

Browse source
This commit is contained in:
Drew DeVault 2017-04-07 07:55:35 -04:00
parent 270e01ce6d
commit 50a31a6c88
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/ipc-server.c
View file

@ -161,7 +161,8 @@ int ipc_handle_connection(int fd, uint32_t mask, void *data) {
} }
int flags; int flags;
if ((flags=fcntl(client_fd, F_GETFD)) == -1 || fcntl(client_fd, F_SETFD, flags|FD_CLOEXEC) == -1) { if ((flags = fcntl(client_fd, F_GETFD)) == -1
|| fcntl(client_fd, F_SETFD, flags|FD_CLOEXEC) == -1) {
sway_log_errno(L_ERROR, "Unable to set CLOEXEC on IPC client socket"); sway_log_errno(L_ERROR, "Unable to set CLOEXEC on IPC client socket");
close(client_fd); close(client_fd);
return 0; return 0;
@ -199,6 +200,8 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
} }
if (mask & WLC_EVENT_HANGUP) { if (mask & WLC_EVENT_HANGUP) {
sway_log(L_DEBUG, "Client %d hung up", client->fd);
close(client->fd);
client->fd = -1; client->fd = -1;
ipc_client_disconnect(client); ipc_client_disconnect(client);
return 0; return 0;