circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-08 01:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Do not attempt to use TIOCSWINSZ on a -1 file descriptor (possible if

Browse Source 
the pane has already died).
This commit is contained in:
nicm 2017-09-06 07:12:41 +00:00
parent eadd79acec
commit 466066c3a1
1 changed files with 2 additions and 2 deletions

4
server-client.c
View File

@ -1069,7 +1069,7 @@ server_client_resize_force(struct window_pane *wp)
memset(&ws, 0, sizeof ws); memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy - 1; ws.ws_row = wp->sy - 1;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
fatal("ioctl failed"); fatal("ioctl failed");
log_debug("%s: %%%u forcing resize", __func__, wp->id); log_debug("%s: %%%u forcing resize", __func__, wp->id);
@ -1095,7 +1095,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
memset(&ws, 0, sizeof ws); memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy; ws.ws_row = wp->sy;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
fatal("ioctl failed"); fatal("ioctl failed");
log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy); log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);