X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/dfb88efd1c9503370bee8e677bbefad6ef41df85..HEAD:/x11fwd.c

diff --git a/x11fwd.c b/x11fwd.c
index 1e04f542..895d8a99 100644
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -171,6 +171,7 @@ struct X11Display *x11_setup_display(char *display, int authtype, Conf *conf)
 	    sk_addr_free(disp->addr);
 	    sfree(disp->hostname);
 	    sfree(disp->unixsocketpath);
+	    sfree(disp);
 	    return NULL;	       /* FIXME: report an error */
 	}
     }
@@ -343,7 +344,7 @@ void x11_get_auth_from_authfile(struct X11Display *disp,
     int len[4];
     int family, protocol;
     int ideal_match = FALSE;
-    char *ourhostname = get_hostname();
+    char *ourhostname;
 
     /*
      * Normally we should look for precisely the details specified in
@@ -372,6 +373,8 @@ void x11_get_auth_from_authfile(struct X11Display *disp,
     if (!authfp)
 	return;
 
+    ourhostname = get_hostname();
+
     /* Records in .Xauthority contain four strings of up to 64K each */
     buf = snewn(65537 * 4, char);