X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/42fee8d6548876e6d055d057c38f9227f9e000fc..88ea89339783ee587180b645981967f6cb8bcd20:/ssh.c

diff --git a/ssh.c b/ssh.c
index ea2ad974..a3255a85 100644
--- a/ssh.c
+++ b/ssh.c
@@ -7094,6 +7094,15 @@ static void ssh2_msg_channel_close(Ssh ssh, struct Packet *pktin)
         }
 
         /*
+         * Abandon any buffered data we still wanted to send to this
+         * channel. Receiving a CHANNEL_CLOSE is an indication that
+         * the server really wants to get on and _destroy_ this
+         * channel, and it isn't going to send us any further
+         * WINDOW_ADJUSTs to permit us to send pending stuff.
+         */
+        bufchain_clear(&c->v.v2.outbuffer);
+
+        /*
          * Send outgoing EOF.
          */
         sshfwd_write_eof(c);
@@ -7543,7 +7552,9 @@ static void ssh2_setup_x11(struct ssh_channel *c, struct Packet *pktin,
     ssh2_pkt_adduint32(pktout, ssh->x11disp->screennum);
     ssh2_pkt_send(ssh, pktout);
 
-    crWaitUntilV(pktin);
+    /* Wait to be called back with either a response packet, or NULL
+     * meaning clean up and free our data */
+    crReturnV;
 
     if (pktin) {
         if (pktin->type == SSH2_MSG_CHANNEL_SUCCESS) {
@@ -7573,7 +7584,9 @@ static void ssh2_setup_agent(struct ssh_channel *c, struct Packet *pktin,
                                ssh2_setup_agent, s);
     ssh2_pkt_send(ssh, pktout);
 
-    crWaitUntilV(pktin);
+    /* Wait to be called back with either a response packet, or NULL
+     * meaning clean up and free our data */
+    crReturnV;
 
     if (pktin) {
         if (pktin->type == SSH2_MSG_CHANNEL_SUCCESS) {
@@ -7620,7 +7633,9 @@ static void ssh2_setup_pty(struct ssh_channel *c, struct Packet *pktin,
     ssh2_pkt_send(ssh, pktout);
     ssh->state = SSH_STATE_INTERMED;
 
-    crWaitUntilV(pktin);
+    /* Wait to be called back with either a response packet, or NULL
+     * meaning clean up and free our data */
+    crReturnV;
 
     if (pktin) {
         if (pktin->type == SSH2_MSG_CHANNEL_SUCCESS) {
@@ -7678,7 +7693,9 @@ static void ssh2_setup_env(struct ssh_channel *c, struct Packet *pktin,
 	s->env_left = s->num_env;
 
 	while (s->env_left > 0) {
-	    crWaitUntilV(pktin);
+            /* Wait to be called back with either a response packet,
+             * or NULL meaning clean up and free our data */
+            crReturnV;
 	    if (!pktin) goto out;
 	    if (pktin->type == SSH2_MSG_CHANNEL_SUCCESS)
 		s->env_ok++;