aboutsummaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2015-07-02 13:18:50 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2015-07-02 13:18:50 +0000
commitb5a1b3a82df411cb95b6a850e9d9d90bc3d082f9 (patch)
tree2fc0f8c0c9b94a14bd7ce42838fc88997f4cd7b8 /kex.c
parentc1e0861503468de5ae00ed0e532f349ec78bec68 (diff)
downloadsrc-b5a1b3a82df411cb95b6a850e9d9d90bc3d082f9.tar.gz
src-b5a1b3a82df411cb95b6a850e9d9d90bc3d082f9.zip
Vendor import of OpenSSH 6.9p1.vendor/openssh/6.9p1
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=285033 svn path=/vendor-crypto/openssh/6.9p1/; revision=285034; tag=vendor/openssh/6.9p1
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kex.c b/kex.c
index 8c2b00179db9..dbc55ef7ee08 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.105 2015/01/30 00:22:25 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.106 2015/04/17 13:25:52 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -229,6 +229,8 @@ kex_prop_free(char **proposal)
{
u_int i;
+ if (proposal == NULL)
+ return;
for (i = 0; i < PROPOSAL_MAX; i++)
free(proposal[i]);
free(proposal);