summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-08-23 03:01:08 +0000
committerDamien Miller <djm@mindrot.org>2018-08-23 13:02:21 +1000
commit7fef173c28f7462dcd8ee017fdf12b5073f54c02 (patch)
tree69b7561b47f5452067248424a6ef3e7957cac43e
parentb8ae02a2896778b8984c7f51566c7f0f56fa8b56 (diff)
upstream: memleak introduced in r1.83; from Colin Watson
OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc
-rw-r--r--auth2-pubkey.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.83 2018/07/31 03:10:27 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.84 2018/08/23 03:01:08 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -193,7 +193,6 @@ userauth_pubkey(struct ssh *ssh)
193 ssh->compat)) == 0) { 193 ssh->compat)) == 0) {
194 authenticated = 1; 194 authenticated = 1;
195 } 195 }
196 sshbuf_free(b);
197 auth2_record_key(authctxt, authenticated, key); 196 auth2_record_key(authctxt, authenticated, key);
198 } else { 197 } else {
199 debug("%s: test pkalg %s pkblob %s%s%s", 198 debug("%s: test pkalg %s pkblob %s%s%s",
@@ -235,6 +234,7 @@ done:
235 } 234 }
236 debug2("%s: authenticated %d pkalg %s", __func__, authenticated, pkalg); 235 debug2("%s: authenticated %d pkalg %s", __func__, authenticated, pkalg);
237 236
237 sshbuf_free(b);
238 sshauthopt_free(authopts); 238 sshauthopt_free(authopts);
239 sshkey_free(key); 239 sshkey_free(key);
240 free(userstyle); 240 free(userstyle);