diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-08 06:15:55 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-08 06:15:55 +0100 |
| commit | fd7c911f090749774cf1869420523c4811beeeb0 (patch) | |
| tree | cd57567ddb3371c0c805a8bd8ace0c66df02fa53 /channels.c | |
| parent | *** empty log message *** (diff) | |
| download | openssh-fd7c911f090749774cf1869420523c4811beeeb0.tar.xz openssh-fd7c911f090749774cf1869420523c4811beeeb0.zip | |
Merged OpenBSD CVS changes that go awayV_1_2_PRE8
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/channels.c b/channels.c index 79a02c88b..032e8f2af 100644 --- a/channels.c +++ b/channels.c @@ -16,7 +16,7 @@ arbitrary tcp/ip connections, and the authentication agent connection. */ #include "includes.h" -RCSID("$Id: channels.c,v 1.3 1999/10/30 01:39:56 damien Exp $"); +RCSID("$Id: channels.c,v 1.4 1999/11/08 05:15:55 damien Exp $"); #include "ssh.h" #include "packet.h" @@ -166,8 +166,10 @@ int channel_allocate(int type, int sock, char *remote_name) void channel_free(int channel) { - assert(channel >= 0 && channel < channels_alloc && - channels[channel].type != SSH_CHANNEL_FREE); + if (channel < 0 || channel >= channels_alloc || + channels[channel].type == SSH_CHANNEL_FREE) + packet_disconnect("channel free: bad local channel %d", channel); + if(compat13) shutdown(channels[channel].sock, SHUT_RDWR); close(channels[channel].sock); @@ -307,9 +309,17 @@ void channel_prepare_select(fd_set *readset, fd_set *writeset) goto reject; } + /* Check fake data length */ + if (x11_fake_data_len != x11_saved_data_len) + { + error("X11 fake_data_len %d != saved_data_len %d", + x11_fake_data_len, x11_saved_data_len); + ch->type = SSH_CHANNEL_OPEN; + goto reject; + } + /* Received authentication protocol and data match our fake data. Substitute the fake data with real data. */ - assert(x11_fake_data_len == x11_saved_data_len); memcpy(ucp + 12 + ((proto_len + 3) & ~3), x11_saved_data, x11_saved_data_len); |