From de2997a4cf22ca0a524f0e5b451693c583e2fd89 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 16 Jul 2018 03:09:13 +0000 Subject: upstream: memleaks; found by valgrind OpenBSD-Commit-ID: 6c3ba22be53e753c899545f771e8399fc93cd844 --- hostfile.c | 4 ++-- packet.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hostfile.c b/hostfile.c index e08339379..e1f826bdd 100644 --- a/hostfile.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -683,11 +683,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/packet.c b/packet.c index cacb6eebe..0ae65bd32 100644 --- a/packet.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -622,6 +622,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); -- cgit v1.2.3