From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 4 Dec 2020 02:27:57 +0000 (+0000)
Subject: upstream: fix minor memleak of kex->hostkey_alg on rekex
X-Git-Tag: V_8_5_P1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553b90feedd7da5b90901d73005f86705456d686;p=thirdparty%2Fopenssh-portable.git

upstream: fix minor memleak of kex->hostkey_alg on rekex

OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50
---

diff --git a/kex.c b/kex.c
index b9f45dd72..4a36310a3 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.161 2020/12/04 02:27:08 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.162 2020/12/04 02:27:57 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -837,6 +837,7 @@ choose_kex(struct kex *k, char *client, char *server)
 static int
 choose_hostkeyalg(struct kex *k, char *client, char *server)
 {
+	free(k->hostkey_alg);
 	k->hostkey_alg = match_list(client, server, NULL);
 
 	debug("kex: host key algorithm: %s",