diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-10-11 15:24:01 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-10-11 15:24:01 +0000 |
| commit | 53d2abb0fe3e426ba6faa07960a0a25262c907f0 (patch) | |
| tree | 55564746b458d7fcdc4fe07f5b1beda730f8b774 /usr.bin/ssh | |
| parent | b4c3fd0e45d257f2fd92f85dd7870964d5df7cf1 (diff) | |
clear select masks if we return before calling select().
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 43332d1f4a1..0e477bc7936 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.83 2001/10/10 22:18:47 markus Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.84 2001/10/11 15:24:00 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -343,9 +343,12 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, FD_SET(fileno(stderr), *writesetp); } else { /* channel_prepare_select could have closed the last channel */ - if (session_closed && !channel_still_open()) { - if (!packet_have_data_to_write()) - return; + if (session_closed && !channel_still_open() && + !packet_have_data_to_write()) { + /* clear mask since we did not call select() */ + memset(*readsetp, 0, *maxfdp); + memset(*writesetp, 0, *maxfdp); + return; } else { FD_SET(connection_in, *readsetp); } |