diff options
author | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:14 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:14 +1100 |
commit | d0fdd6818c1633656fd47ee1de9438130eb9eb03 (patch) | |
tree | 4f1f09bdfaa8f2c3c3574e347b76b2982a3771ee /clientloop.c | |
parent | 6a740e7b92c8dba96e81ad3979849e7abcd26829 (diff) |
- djm@cvs.openbsd.org 2010/11/23 23:57:24
[clientloop.c]
avoid NULL deref on receiving a channel request on an unknown or invalid
channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 076386cc2..91eea8562 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.225 2010/11/21 01:01:13 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.226 2010/11/23 23:57:24 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1933,7 +1933,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt) | |||
1933 | } | 1933 | } |
1934 | packet_check_eom(); | 1934 | packet_check_eom(); |
1935 | } | 1935 | } |
1936 | if (reply) { | 1936 | if (reply && c != NULL) { |
1937 | packet_start(success ? | 1937 | packet_start(success ? |
1938 | SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); | 1938 | SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); |
1939 | packet_put_int(c->remote_id); | 1939 | packet_put_int(c->remote_id); |