From: djm <djm@openbsd.org>
Date: Mon, 16 Jul 2018 03:09:13 +0000 (+0000)
Subject: memleaks; found by valgrind
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a2ee6d1b4100160055f79f62f61f3ae35f48746f;p=openbsd

memleaks; found by valgrind
---

diff --git a/usr.bin/ssh/hostfile.c b/usr.bin/ssh/hostfile.c
index 14aca7c3795..9dc64b731b6 100644
--- a/usr.bin/ssh/hostfile.c
+++ b/usr.bin/ssh/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.72 2018/06/06 18:29:18 markus Exp $ */
+/* $OpenBSD: hostfile.c,v 1.73 2018/07/16 03:09:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -680,11 +680,11 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
 		linenum++;
 		line[strcspn(line, "\n")] = '\0';
 
+		free(lineinfo.line);
 		sshkey_free(lineinfo.key);
 		memset(&lineinfo, 0, sizeof(lineinfo));
 		lineinfo.path = path;
 		lineinfo.linenum = linenum;
-		free(lineinfo.line);
 		lineinfo.line = xstrdup(line);
 		lineinfo.marker = MRK_NONE;
 		lineinfo.status = HKF_STATUS_OK;
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index eab5a58c325..ab9b198d63b 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.276 2018/07/09 21:03:30 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.277 2018/07/16 03:09:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -611,6 +611,8 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
 	cipher_free(state->receive_context);
 	state->send_context = state->receive_context = NULL;
 	if (do_close) {
+		free(ssh->local_ipaddr);
+		ssh->local_ipaddr = NULL;
 		free(ssh->remote_ipaddr);
 		ssh->remote_ipaddr = NULL;
 		free(ssh->state);