From dee8e5688b4395ee379fd7f36f4a488d57fd0d6c Mon Sep 17 00:00:00 2001 From: Jon Simons Date: Wed, 26 Feb 2014 18:51:24 -0800 Subject: [PATCH] channel: check for closed state in waitwindow loops Signed-off-by: Jon Simons Reviewed-by: Andreas Schneider --- src/channels.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/channels.c b/src/channels.c index 7a72cfe4..1766f7a1 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1241,7 +1241,8 @@ error: static int ssh_channel_waitwindow_termination(void *c){ ssh_channel channel = (ssh_channel) c; if (channel->remote_window > 0 || - channel->session->session_state == SSH_SESSION_STATE_ERROR) + channel->session->session_state == SSH_SESSION_STATE_ERROR || + channel->state == SSH_CHANNEL_STATE_CLOSED) return 1; else return 0; @@ -1350,7 +1351,8 @@ static int channel_write_common(ssh_channel channel, ssh_channel_waitwindow_termination,channel); if (rc == SSH_ERROR || !ssh_channel_waitwindow_termination(channel) || - channel->session->session_state == SSH_SESSION_STATE_ERROR) + channel->session->session_state == SSH_SESSION_STATE_ERROR || + channel->state == SSH_CHANNEL_STATE_CLOSED) goto out; continue; }