Missing bits for colour selection support.

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index c37762e..a004176 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -3177,6 +3177,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                }
            } else {
                while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
+               dport = -1;
            }
            sport = atoi(sports);
            sserv = 0;
@@ -5271,6 +5272,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                }
            } else {
                while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
+               dport = -1;
            }
            sport = atoi(sports);
            sserv = 0;
@@ -5847,10 +5849,12 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                pktsize = ssh2_pkt_getuint32(ssh);
 
                if (typelen == 3 && !memcmp(type, "x11", 3)) {
-                   char *addrstr = snewn(peeraddrlen+1, char);
+                   char *addrstr;
+
+                    ssh2_pkt_getstring(ssh, &peeraddr, &peeraddrlen);
+                   addrstr = snewn(peeraddrlen+1, char);
                    memcpy(addrstr, peeraddr, peeraddrlen);
                    peeraddr[peeraddrlen] = '\0';
-                    ssh2_pkt_getstring(ssh, &peeraddr, &peeraddrlen);
                     peerport = ssh2_pkt_getuint32(ssh);
 
                    if (!ssh->X11_fwd_enabled)