RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-11 04:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
revision 1.39
date: 2012/01/20 07:09:42;  author: tedu;  state: Exp;  lines: +4 -4;
the glob stat limit is way too low.  bump to 2048.
while here, failed stats should count against the limit too.
ok deraadt sthen stsp
This commit is contained in:
Damien Miller 2019-11-15 15:07:30 +11:00
parent 01362cf7cb
commit bb7413db98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsd-compat/glob.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: glob.c,v 1.38 2011/09/22 06:27:29 djm Exp $ */ /* $OpenBSD: glob.c,v 1.39 2012/01/20 07:09:42 tedu Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -131,7 +131,7 @@ typedef char Char;
#define ismeta(c) (((c)&M_QUOTE) != 0) #define ismeta(c) (((c)&M_QUOTE) != 0)
#define GLOB_LIMIT_MALLOC 65536 #define GLOB_LIMIT_MALLOC 65536
#define GLOB_LIMIT_STAT 128 #define GLOB_LIMIT_STAT 2048
#define GLOB_LIMIT_READDIR 16384 #define GLOB_LIMIT_READDIR 16384
/* Limit of recursion during matching attempts. */ /* Limit of recursion during matching attempts. */
@ -639,8 +639,6 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
for (anymeta = 0;;) { for (anymeta = 0;;) {
if (*pattern == EOS) { /* End of pattern? */ if (*pattern == EOS) { /* End of pattern? */
*pathend = EOS; *pathend = EOS;
if (g_lstat(pathbuf, &sb, pglob))
return(0);
if ((pglob->gl_flags & GLOB_LIMIT) && if ((pglob->gl_flags & GLOB_LIMIT) &&
limitp->glim_stat++ >= GLOB_LIMIT_STAT) { limitp->glim_stat++ >= GLOB_LIMIT_STAT) {
@ -649,6 +647,8 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
*pathend = EOS; *pathend = EOS;
return(GLOB_NOSPACE); return(GLOB_NOSPACE);
} }
if (g_lstat(pathbuf, &sb, pglob))
return(0);
if (((pglob->gl_flags & GLOB_MARK) && if (((pglob->gl_flags & GLOB_MARK) &&
pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) || pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) ||