[openssh-commits] [openssh] 08/25: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 44a8e7ce6f3ab4c2eb1ae49115c210b98e53c4df
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Apr 17 13:25:52 2015 +0000

    upstream commit
    
    don't try to cleanup NULL KEX proposals in
     kex_prop_free(); found by Jukka Taimisto and Markus Hietava
---
 kex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kex.c b/kex.c
index 8c2b001..dbc55ef 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.