When looking for a local username on Windows, if we can get hold of the

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 23afa6a..8887d9b 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -2853,6 +2853,8 @@ static int ssh_do_close(Ssh ssh, int notify_exit)
            del234(ssh->portfwds, pf); /* moving next one to index 0 */
            free_portfwd(pf);
        }
+       freetree234(ssh->portfwds);
+       ssh->portfwds = NULL;
     }
 
     return ret;
@@ -6668,11 +6670,13 @@ static void ssh2_msg_channel_eof(Ssh ssh, struct Packet *pktin)
         * wrap up and close the channel ourselves.
         */
        x11_close(c->u.x11.s);
+       c->u.x11.s = NULL;
        sshfwd_close(c);
     } else if (c->type == CHAN_AGENT) {
        sshfwd_close(c);
     } else if (c->type == CHAN_SOCKDATA) {
        pfd_close(c->u.pfd.s);
+       c->u.pfd.s = NULL;
        sshfwd_close(c);
     }
 }