Fix obvious foulup in X forwarding: my recent `how did this ever

work' change to port forwarding completely broke it, by failing to
set peeraddr{,len} before reading them. Oops.

[originally from svn r3127]

diff --git a/ssh.c b/ssh.c
index c37762edef52c78ede73646d7773dbacc8018fc7..925c5b5e004d3a10db4a3250f2dc87596ec7405e 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -5847,10 +5847,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)