upstream commit

ban ConnectionAttempts=0, it makes no sense and would cause
 ssh_connect_direct() to print an uninitialised stack variable; bz#2500
 reported by dvw AT phas.ubc.ca

Upstream-ID: 32b5134c608270583a90b93a07b3feb3cbd5f7d5

1 files changed, 3 insertions, 1 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 1507934d8..b2c878a50 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.267 2015/11/19 01:09:38 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.268 2015/11/19 08:23:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -434,6 +434,8 @@ ssh_connect_direct(const char *host, struct addrinfo *aitop,
         struct addrinfo *ai;
 
         debug2("%s: needpriv %d", __func__, needpriv);
+        memset(ntop, 0, sizeof(ntop));
+        memset(strport, 0, sizeof(strport));
 
         for (attempt = 0; attempt < connection_attempts; attempt++) {
                 if (attempt > 0) {