Attachment 2431 Details for Bug 1818 – improved fix handling both client and server

[patch] improved fix handling both client and server

bz1818.diff (text/plain), 1.18 KB, created by Simon Tatham on 2014-04-19 20:21:01 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Tatham

Created: 2014-04-19 20:21:01 AEST

Size: 1.18 KB

patch

obsolete

>commit cf2de73b0cd13a9045bca474c3c772748007008b
>Author: Simon Tatham <anakin@pobox.com>
>Date:   Fri Apr 18 15:40:41 2014 +0100
>
>    Channel requests should not be replied to after sending CHANNEL_CLOSE.
>    
>    Fixes bug #1818.
>
>diff --git a/clientloop.c b/clientloop.c
>index 59ad3a2..ec55809 100644
>--- a/clientloop.c
>+++ b/clientloop.c
>@@ -2054,7 +2054,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
> 		}
> 		packet_check_eom();
> 	}
>-	if (reply && c != NULL) {
>+	if (reply && c != NULL && !(c->flags & CHAN_CLOSE_SENT)) {
> 		packet_start(success ?
> 		    SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
> 		packet_put_int(c->remote_id);
>diff --git a/serverloop.c b/serverloop.c
>index 2f8e3a0..355b3ed 100644
>--- a/serverloop.c
>+++ b/serverloop.c
>@@ -1204,7 +1204,7 @@ server_input_channel_req(int type, u_int32_t seq, void *ctxt)
> 	} else if ((c->type == SSH_CHANNEL_LARVAL ||
> 	    c->type == SSH_CHANNEL_OPEN) && strcmp(c->ctype, "session") == 0)
> 		success = session_input_channel_req(c, rtype);
>-	if (reply) {
>+	if (reply && !(c->flags & CHAN_CLOSE_SENT)) {
> 		packet_start(success ?
> 		    SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
> 		packet_put_int(c->remote_id);

Actions: View | Diff

Attachments on bug 1818: 1925 | 1926 | 2431