From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 23 Aug 2018 03:01:08 +0000 (+0000)
Subject: upstream: memleak introduced in r1.83; from Colin Watson
X-Git-Tag: V_7_8_P1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fef173c28f7462dcd8ee017fdf12b5073f54c02;p=thirdparty%2Fopenssh-portable.git

upstream: memleak introduced in r1.83; from Colin Watson

OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc
---

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index e1c150401..3d9f9af1f 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.83 2018/07/31 03:10:27 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.84 2018/08/23 03:01:08 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -193,7 +193,6 @@ userauth_pubkey(struct ssh *ssh)
 		    ssh->compat)) == 0) {
 			authenticated = 1;
 		}
-		sshbuf_free(b);
 		auth2_record_key(authctxt, authenticated, key);
 	} else {
 		debug("%s: test pkalg %s pkblob %s%s%s",
@@ -235,6 +234,7 @@ done:
 	}
 	debug2("%s: authenticated %d pkalg %s", __func__, authenticated, pkalg);
 
+	sshbuf_free(b);
 	sshauthopt_free(authopts);
 	sshkey_free(key);
 	free(userstyle);