circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/3798/merge
Thomas Adam 2024-01-16 14:01:09 +00:00
parent e809c2ec35 2e39d698d2
commit 001e26d0bb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proc.c
View File

@ -93,8 +93,9 @@ proc_event_cb(__unused int fd, short events, void *arg)
log_debug("peer %p message %d", peer, imsg.hdr.type); log_debug("peer %p message %d", peer, imsg.hdr.type);
if (peer_check_version(peer, &imsg) != 0) { if (peer_check_version(peer, &imsg) != 0) {
if (imsg.fd != -1) int fd = imsg_get_fd(&imsg);
close(imsg.fd); if (fd != -1)
close(fd);
imsg_free(&imsg); imsg_free(&imsg);
break; break;
} }

8
server-client.c
View File

@ -2998,14 +2998,14 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
case MSG_IDENTIFY_STDIN: case MSG_IDENTIFY_STDIN:
if (datalen != 0) if (datalen != 0)
fatalx("bad MSG_IDENTIFY_STDIN size"); fatalx("bad MSG_IDENTIFY_STDIN size");
c->fd = imsg->fd; c->fd = imsg_get_fd(imsg);
log_debug("client %p IDENTIFY_STDIN %d", c, imsg->fd); log_debug("client %p IDENTIFY_STDIN %d", c, c->fd);
break; break;
case MSG_IDENTIFY_STDOUT: case MSG_IDENTIFY_STDOUT:
if (datalen != 0) if (datalen != 0)
fatalx("bad MSG_IDENTIFY_STDOUT size"); fatalx("bad MSG_IDENTIFY_STDOUT size");
c->out_fd = imsg->fd; c->out_fd = imsg_get_fd(imsg);
log_debug("client %p IDENTIFY_STDOUT %d", c, imsg->fd); log_debug("client %p IDENTIFY_STDOUT %d", c, c->out_fd);
break; break;
case MSG_IDENTIFY_ENVIRON: case MSG_IDENTIFY_ENVIRON:
if (datalen == 0 || data[datalen - 1] != '\0') if (datalen == 0 || data[datalen - 1] != '\0')