mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 15:25:58 +00:00
Code Issues Releases Wiki Activity

Move pattern length check until after we have initialized the glob_t

Browse Source 
so we can call globfree() even on error.  From Frank Denis.
This commit is contained in:
Todd C. Miller
2015-06-13 08:13:48 -06:00
parent 25917e435c
commit f43f530987
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util/glob.c
View File

@@ -203,9 +203,6 @@ sudo_glob(const char *pattern, int flags, int (*errfunc)(const char *, int),
Char *bufnext, *bufend, patbuf[PATH_MAX]; Char *bufnext, *bufend, patbuf[PATH_MAX];
struct glob_lim limit = { 0, 0, 0 }; struct glob_lim limit = { 0, 0, 0 };
if (strnlen(pattern, PATH_MAX) == PATH_MAX)
return GLOB_NOMATCH;
patnext = (unsigned char *) pattern; patnext = (unsigned char *) pattern;
if (!(flags & GLOB_APPEND)) { if (!(flags & GLOB_APPEND)) {
pglob->gl_pathc = 0; pglob->gl_pathc = 0;
@@ -222,6 +219,9 @@ sudo_glob(const char *pattern, int flags, int (*errfunc)(const char *, int),
pglob->gl_pathc >= INT_MAX - pglob->gl_offs - 1) pglob->gl_pathc >= INT_MAX - pglob->gl_offs - 1)
return GLOB_NOSPACE; return GLOB_NOSPACE;
if (strnlen(pattern, PATH_MAX) == PATH_MAX)
return GLOB_NOMATCH;
bufnext = patbuf; bufnext = patbuf;
bufend = bufnext + PATH_MAX - 1; bufend = bufnext + PATH_MAX - 1;
if (flags & GLOB_NOESCAPE) if (flags & GLOB_NOESCAPE)