From: jsg@openbsd.org <jsg@openbsd.org>
Date: Fri, 5 Feb 2016 04:31:21 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d7dac790693ce420d225119283bc355cff9185;p=thirdparty%2Fopenssh-portable.git

upstream commit

avoid an uninitialised value when NumberOfPasswordPrompts
 is 0 ok markus@ djm@

Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b
---

diff --git a/sshconnect2.c b/sshconnect2.c
index 4d426c33c..88365817b 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.237 2016/01/14 22:56:56 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.238 2016/02/05 04:31:21 jsg Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1198,7 +1198,7 @@ send_pubkey_test(Authctxt *authctxt, Identity *id)
 static Key *
 load_identity_file(Identity *id)
 {
-	Key *private;
+	Key *private = NULL;
 	char prompt[300], *passphrase, *comment;
 	int r, perm_ok = 0, quit = 0, i;
 	struct stat st;