The branch, master has been updated
via 80b5c0e0768f938dcb80778e4db057333c74989e (commit)
via 7a3ec77dbdb43058bfd810ed7a63f645c8521ee0 (commit)
from 48750022c092396e1b9259119fcb9772d6e125f1 (commit)
- Log -----------------------------------------------------------------
commit 80b5c0e0768f938dcb80778e4db057333c74989e
Merge: 4875002 7a3ec77
Author: Thomas <tho...@xteddy.org>
Commit: Thomas <tho...@xteddy.org>
Merge branch 'obsd-master'
Sync from OpenBSD.
* obsd-master:
Do not leak file descriptor if not a tty, reported by Sebastien Marie.
server-client.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
commit 7a3ec77dbdb43058bfd810ed7a63f645c8521ee0
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Do not leak file descriptor if not a tty, reported by Sebastien Marie.
---
server-client.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server-client.c b/server-client.c
index 7b7a3e4..7f5bfe1 100644
--- a/server-client.c
+++ b/server-client.c
@@ -912,8 +912,10 @@ server_client_msg_identify(
return;
}
- if (!isatty(fd))
- return;
+ if (!isatty(fd)) {
+ close(fd);
+ return;
+ }
data->term[(sizeof data->term) - 1] = '\0';
tty_init(&c->tty, c, fd, data->term);
if (data->flags & IDENTIFY_UTF8)
-----------------------------------------------------------------------
Summary of changes:
server-client.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://ad.doubleclick.net/clk;258768047;13503038;j?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
