aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-10-11 16:52:39 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-10-11 16:52:39 +0100
commit8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1 (patch)
tree3320e1e3b53905d8c50b6067c27b14946271c35b /server-client.c
parente588ddb5d683a9fd5cf595ac5ed2d8ba657a6bcf (diff)
parentd518067be6220757a9101ca27fff14d5f599c410 (diff)
downloadrtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.tar.gz
rtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.tar.bz2
rtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts: cmd-split-window.c cmd-unbind-key.c format.c osdep-openbsd.c
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/server-client.c b/server-client.c
index aceef6e2..cc18a96f 100644
--- a/server-client.c
+++ b/server-client.c
@@ -808,6 +808,8 @@ server_client_msg_dispatch(struct client *c)
if (imsg.hdr.peerid != PROTOCOL_VERSION) {
server_write_client(c, MSG_VERSION, NULL, 0);
c->flags |= CLIENT_BAD;
+ if (imsg.fd != -1)
+ close(imsg.fd);
imsg_free(&imsg);
continue;
}