From 18e491e7bf453b89cdd65c6b6a998ffdb86a12ea Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Fri, 17 Apr 2015 13:25:52 +0000
Subject: [PATCH] don't try to cleanup NULL KEX proposals in kex_prop_free();
 found by Jukka Taimisto and Markus Hietava

---
 usr.bin/ssh/kex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index d5d7e5cc48b..b328e5f0dbe 100644
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/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.
  *
@@ -210,6 +210,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);
-- 
2.20.1