"possible unintended assignment"? I think not.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2468 cda61777-01e9-0310-a592-d414129be87e

diff --git a/x11fwd.c b/x11fwd.c
index decb259..d21441b 100644 (file)
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -204,7 +204,7 @@ char *x11_init(Socket * s, char *display, void *c, void *auth)
      * Try to find host.
      */
     addr = name_lookup(host, port, &dummy_realhost);
-    if ((err = sk_addr_error(addr)))
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     port = 6000 + displaynum;
@@ -222,7 +222,7 @@ char *x11_init(Socket * s, char *display, void *c, void *auth)
     pr->c = c;
 
     pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
-    if ((err = sk_socket_error(*s))) {
+    if ((err = sk_socket_error(*s)) != NULL) {
        sfree(pr);
        return err;
     }