summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-16 06:03:30 +0000
committerDamien Miller <djm@mindrot.org>2019-10-16 17:08:38 +1100
commit6500c3bc71bf4fe14972c1177e6b93f1164d07a4 (patch)
tree220f6d2665825a9dd741fc4eea9ab44e51929edb
parentd7d116b6d9e6cb79cc235e9801caa683d3db3181 (diff)
upstream: free buf before return; reported by krishnaiah bommu
OpenBSD-Commit-ID: 091bb23a6e913af5d4f72c50030b53ce1cef4de1
-rw-r--r--ssh-keygen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 8c829cad6..27ccc15df 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.355 2019/10/03 17:07:50 jmc Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.356 2019/10/16 06:03:30 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -651,6 +651,7 @@ do_convert_from_ssh2(struct passwd *pw, struct sshkey **k, int *private)
651 *k = do_convert_private_ssh2(buf); 651 *k = do_convert_private_ssh2(buf);
652 else if ((r = sshkey_fromb(buf, k)) != 0) 652 else if ((r = sshkey_fromb(buf, k)) != 0)
653 fatal("decode blob failed: %s", ssh_err(r)); 653 fatal("decode blob failed: %s", ssh_err(r));
654 sshbuf_free(buf);
654 fclose(fp); 655 fclose(fp);
655} 656}
656 657