diff options
| author | Damien Miller <djm@mindrot.org> | 2010-10-07 13:10:38 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-10-07 13:10:38 +0200 |
| commit | 37f4f1892f1af1dd9f3a646f79ff8afaf9c8a646 (patch) | |
| tree | 0fcb3e4c19234af587c5762df26d1abf6d741a6a /openbsd-compat/glob.c | |
| parent | - djm@cvs.openbsd.org 2010/10/06 21:10:21 (diff) | |
| download | openssh-37f4f1892f1af1dd9f3a646f79ff8afaf9c8a646.tar.xz openssh-37f4f1892f1af1dd9f3a646f79ff8afaf9c8a646.zip | |
- (djm) [openbsd-compat/glob.c] restore ARG_MAX compat code.
Diffstat (limited to 'openbsd-compat/glob.c')
| -rw-r--r-- | openbsd-compat/glob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 7bbe6c71a..e52bef729 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -804,7 +804,7 @@ globextend(const Char *path, glob_t *pglob, size_t *limitp, struct stat *sb) pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; if ((pglob->gl_flags & GLOB_LIMIT) && - (newn * sizeof(*pathv)) + *limitp >= ARG_MAX) { + (newn * sizeof(*pathv)) + *limitp >= (u_int) get_arg_max()) { errno = 0; return(GLOB_NOSPACE); } |