unbreak; move clearing of cctx struct to before first use
authordjm <djm@openbsd.org>
Sat, 12 Jul 2008 04:52:50 +0000 (04:52 +0000)
committerdjm <djm@openbsd.org>
Sat, 12 Jul 2008 04:52:50 +0000 (04:52 +0000)
reported by dkrause@

usr.bin/ssh/channels.c

index 3fdf847..57e1030 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.283 2008/07/10 18:05:58 markus Exp $ */
+/* $OpenBSD: channels.c,v 1.284 2008/07/12 04:52:50 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2837,6 +2837,7 @@ connect_to(const char *host, u_short port, char *ctype, char *rname)
        struct channel_connect cctx;
        Channel *c;
 
+       memset(&cctx, 0, sizeof(cctx));
        memset(&hints, 0, sizeof(hints));
        hints.ai_family = IPv4or6;
        hints.ai_socktype = SOCK_STREAM;
@@ -2847,7 +2848,6 @@ connect_to(const char *host, u_short port, char *ctype, char *rname)
                return NULL;
        }
 
-       memset(&cctx, 0, sizeof(cctx));
        cctx.host = xstrdup(host);
        cctx.port = port;
        cctx.ai = cctx.aitop;