extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-08 17:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 750:

Browse Source 
Do not need to dup() the tty fd sent from the client because it is
already dup()d again later. Fixes a leak seen by espie@.
This commit is contained in:
Tiago Cunha 2010-08-29 14:39:45 +00:00
parent aba555509e
commit e6bb3d6942
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server-client.c
View File

@ -1,4 +1,4 @@
/* $Id: server-client.c,v 1.39 2010-08-11 22:16:03 tcunha Exp $ */ /* $Id: server-client.c,v 1.40 2010-08-29 14:39:45 tcunha Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -695,17 +695,15 @@ server_client_msg_dispatch(struct client *c)
fatalx("MSG_IDENTIFY missing fd"); fatalx("MSG_IDENTIFY missing fd");
memcpy(&identifydata, imsg.data, sizeof identifydata); memcpy(&identifydata, imsg.data, sizeof identifydata);
c->stdin_fd = dup(imsg.fd); c->stdin_fd = imsg.fd;
if (c->stdin_fd == -1)
fatal("dup failed");
c->stdin_event = bufferevent_new(c->stdin_fd, c->stdin_event = bufferevent_new(c->stdin_fd,
NULL, NULL, server_client_in_callback, c); NULL, NULL, server_client_in_callback, c);
if (c->stdin_event == NULL) if (c->stdin_event == NULL)
fatalx("failed to create stdin event"); fatalx("failed to create stdin event");
if ((mode = fcntl(imsg.fd, F_GETFL)) != -1) if ((mode = fcntl(c->stdin_fd, F_GETFL)) != -1)
fcntl(imsg.fd, F_SETFL, mode|O_NONBLOCK); fcntl(c->stdin_fd, F_SETFL, mode|O_NONBLOCK);
if (fcntl(imsg.fd, F_SETFD, FD_CLOEXEC) == -1) if (fcntl(c->stdin_fd, F_SETFD, FD_CLOEXEC) == -1)
fatal("fcntl failed"); fatal("fcntl failed");
server_client_msg_identify(c, &identifydata, imsg.fd); server_client_msg_identify(c, &identifydata, imsg.fd);