From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 16 Oct 2019 06:03:30 +0000 (+0000)
Subject: upstream: free buf before return; reported by krishnaiah bommu
X-Git-Tag: V_8_2_P1~403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6500c3bc71bf4fe14972c1177e6b93f1164d07a4;p=thirdparty%2Fopenssh-portable.git

upstream: free buf before return; reported by krishnaiah bommu

OpenBSD-Commit-ID: 091bb23a6e913af5d4f72c50030b53ce1cef4de1
---

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 @@
-/* $OpenBSD: ssh-keygen.c,v 1.355 2019/10/03 17:07:50 jmc Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.356 2019/10/16 06:03:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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)
 		*k = do_convert_private_ssh2(buf);
 	else if ((r = sshkey_fromb(buf, k)) != 0)
 		fatal("decode blob failed: %s", ssh_err(r));
+	sshbuf_free(buf);
 	fclose(fp);
 }