From 5d0077008f6b9ff00dac01e2265cbfe67d4fe1d0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 11 Feb 2012 08:19:02 +1100 Subject: [PATCH] - markus@cvs.openbsd.org 2012/01/25 19:36:31 [authfile.c] memleak in key_load_file(); from Jan Klemkow --- ChangeLog | 3 +++ authfile.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 460a635ba..2e5881af6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,9 @@ [packet.c] do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying; ok dtucker@, djm@ + - markus@cvs.openbsd.org 2012/01/25 19:36:31 + [authfile.c] + memleak in key_load_file(); from Jan Klemkow 20120206 - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms diff --git a/authfile.c b/authfile.c index 1d7e53cd1..7dd449690 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.92 2011/06/14 22:49:18 markus Exp $ */ +/* $OpenBSD: authfile.c,v 1.93 2012/01/25 19:36:31 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -340,7 +340,7 @@ key_load_file(int fd, const char *filename, Buffer *blob) filename == NULL ? "" : " "); return 0; } - buffer_init(blob); + buffer_clear(blob); for (;;) { if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { if (errno == EPIPE)