diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2020-04-21 18:27:23 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-04-21 18:28:19 +1000 |
| commit | 8854724ccefc1fa16f10b37eda2e759c98148caa (patch) | |
| tree | df753f9db792d71f6b8b07d1863aa62b259cb0fc | |
| parent | d00d07b6744d3b4bb7aca46c734ecd670148da23 (diff) | |
Sync rev 1.49.
Prevent infinite for loop since i went from ssize_t to size_t. Patch from
eagleoflqj via OpenSSH github PR#178, ok djm@, feedback & ok millert@
| -rw-r--r-- | openbsd-compat/glob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 9dcc4442..e8915178 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.48 2019/02/04 16:45:40 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.49 2020/04/21 08:25:22 dtucker Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -833,7 +833,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp, if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { /* first time around -- clear initial gl_offs items */ pathv += pglob->gl_offs; - for (i = pglob->gl_offs; --i >= 0; ) + for (i = pglob->gl_offs; i > 0; i--) *--pathv = NULL; } pglob->gl_pathv = pathv; @@ -845,7 +845,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp, if (pglob->gl_statv == NULL && pglob->gl_offs > 0) { /* first time around -- clear initial gl_offs items */ statv += pglob->gl_offs; - for (i = pglob->gl_offs; --i >= 0; ) + for (i = pglob->gl_offs; i > 0; i--) *--statv = NULL; } pglob->gl_statv = statv; |