- (djm) OpenBSD CVS Sync

   - djm@cvs.openbsd.org 2008/07/12 04:52:50
     [channels.c]
     unbreak; move clearing of cctx struct to before first use
     reported by dkrause@

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b3263e909..6244e39b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20080712
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2008/07/12 04:52:50
+     [channels.c]
+     unbreak; move clearing of cctx struct to before first use
+     reported by dkrause@
+
 20080711
  - (djm) OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2008/07/07 00:31:41
@@ -4622,4 +4629,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5073 2008/07/11 07:36:48 djm Exp $
+$Id: ChangeLog,v 1.5074 2008/07/12 07:12:29 djm Exp $
diff --git a/channels.c b/channels.c
index 9f27fa632..7be577838 100644
--- a/channels.c
+++ b/channels.c
@@ -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
@@ -2865,6 +2865,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;
@@ -2875,7 +2876,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;