RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[authfile.c]
     memleak in key_load_file(); from Jan Klemkow
This commit is contained in:
Damien Miller 2012-02-11 08:19:02 +11:00
parent 1de2cfe9a9
commit 5d0077008f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24,6 +24,9 @@
[packet.c] [packet.c]
do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying; do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying;
ok dtucker@, djm@ ok dtucker@, djm@
- markus@cvs.openbsd.org 2012/01/25 19:36:31
[authfile.c]
memleak in key_load_file(); from Jan Klemkow
20120206 20120206
- (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms

4
authfile.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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 ? "" : " "); filename == NULL ? "" : " ");
return 0; return 0;
} }
buffer_init(blob); buffer_clear(blob);
for (;;) { for (;;) {
if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) {
if (errno == EPIPE) if (errno == EPIPE)