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

- djm@cvs.openbsd.org 2011/09/22 06:29:03

Browse Source 
[sftp.c]
     don't let remote_glob() implicitly sort its results in do_globbed_ls() -
     in all likelihood, they will be resorted anyway
This commit is contained in:
Damien Miller 2011-09-22 21:43:06 +10:00
parent 57c38ac7d5
commit d7be70d052
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -70,6 +70,10 @@
- markus@cvs.openbsd.org 2011/09/12 08:46:15 - markus@cvs.openbsd.org 2011/09/12 08:46:15
[sftp-client.c] [sftp-client.c]
fix leak in do_lsreaddir(); ok djm fix leak in do_lsreaddir(); ok djm
- djm@cvs.openbsd.org 2011/09/22 06:29:03
[sftp.c]
don't let remote_glob() implicitly sort its results in do_globbed_ls() -
in all likelihood, they will be resorted anyway
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

5
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.133 2011/09/22 06:29:03 djm Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -793,7 +793,8 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
memset(&g, 0, sizeof(g)); memset(&g, 0, sizeof(g));
if (remote_glob(conn, path, if (remote_glob(conn, path,
GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT, NULL, &g) || GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT|GLOB_NOSORT,
NULL, &g) ||
(g.gl_pathc && !g.gl_matchc)) { (g.gl_pathc && !g.gl_matchc)) {
if (g.gl_pathc) if (g.gl_pathc)
globfree(&g); globfree(&g);