X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=x11fwd.c;h=139cb7750d7b98bebd4c9e87a77f21ea1a47a7b2;hb=12e019bafc75cb441e965c63e15dfceeaf71ca1e;hp=13c6823ec47fcd186acc613c2e78d728b5a2de4c;hpb=6eec320f0b3606f17f06a290acdbb8f84afdff00;p=PuTTY.git

diff --git a/x11fwd.c b/x11fwd.c
index 13c6823e..139cb775 100644
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -245,7 +245,7 @@ char *x11_display(const char *display) {
     char *ret;
     if(!display || !*display) {
 	/* try to find platform-specific local display */
-	if((ret = platform_get_x_display())==0)
+	if((ret = platform_get_x_display())==0 || !*ret)
 	    /* plausible default for all platforms */
 	    ret = dupstr(":0");
     } else
@@ -485,7 +485,7 @@ int x11_send(Socket s, char *data, int len)
             char realauthdata[64];
             int realauthlen = 0;
             int authstrlen = strlen(x11_authnames[pr->auth->realproto]);
-	    int buflen;
+	    int buflen = 0;	       /* initialise to placate optimiser */
             static const char zeroes[4] = { 0,0,0,0 };
 	    void *buf;