- markus@cvs.openbsd.org 2012/01/25 19:36:31

     [authfile.c]
     memleak in key_load_file(); from Jan Klemkow

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 460a635b..2e5881af 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 1d7e53cd..7dd44969 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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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)