From 44a8e7ce6f3ab4c2eb1ae49115c210b98e53c4df Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 17 Apr 2015 13:25:52 +0000 Subject: 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(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index 8c2b00179..dbc55ef7e 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); -- cgit v1.2.3