tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2011/09/12 08:46:15

Browse Source 
[sftp-client.c]
     fix leak in do_lsreaddir(); ok djm
This commit is contained in:
Damien Miller 2011-09-22 21:42:45 +10:00
parent 3decdba425
commit 57c38ac7d5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -67,6 +67,9 @@
[sftp-client.c] [sftp-client.c]
fix leaks in do_hardlink() and do_readlink(); bz#1921 fix leaks in do_hardlink() and do_readlink(); bz#1921
from Loganaden Velvindron from Loganaden Velvindron
- markus@cvs.openbsd.org 2011/09/12 08:46:15
[sftp-client.c]
fix leak in do_lsreaddir(); ok djm
20110909 20110909
- (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From

9
sftp-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.95 2011/09/11 16:07:26 markus Exp $ */ /* $OpenBSD: sftp-client.c,v 1.96 2011/09/12 08:46:15 markus Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -462,12 +462,12 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
buffer_put_cstring(&msg, path); buffer_put_cstring(&msg, path);
send_msg(conn, &msg); send_msg(conn, &msg);
buffer_clear(&msg);
handle = get_handle(conn, id, &handle_len, handle = get_handle(conn, id, &handle_len,
"remote readdir(\"%s\")", path); "remote readdir(\"%s\")", path);
if (handle == NULL) if (handle == NULL) {
buffer_free(&msg);
return -1; return -1;
}
if (dir) { if (dir) {
ents = 0; ents = 0;
@ -510,6 +510,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
fx2txt(status)); fx2txt(status));
do_close(conn, handle, handle_len); do_close(conn, handle, handle_len);
xfree(handle); xfree(handle);
buffer_free(&msg);
return(status); return(status);
} }
} else if (type != SSH2_FXP_NAME) } else if (type != SSH2_FXP_NAME)