AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use size_t instead of int for internal variables in glob (bug 14621).

Browse Source
This commit is contained in:
Joseph Myers 2012-09-25 19:38:15 +00:00
parent 22bf5c1793
commit b87c4b24d9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2012-09-25 Joseph Myers <joseph@codesourcery.com>
[BZ #14621]
* posix/glob.c (next_brace_sub): Use size_t instead of unsigned
int as type of variable DEPTH.
(glob): Use size_t instead of int as type of variables NEWCOUNT
and OLD_PATHC.
2012-09-25 Liubov Dmitrieva <liubov.dmitrieva@gmail.com> 2012-09-25 Liubov Dmitrieva <liubov.dmitrieva@gmail.com>
* sysdeps/i386/i686/fpu/multiarch/Makefile (sysdep_routines): * sysdeps/i386/i686/fpu/multiarch/Makefile (sysdep_routines):

10
posix/glob.c
View File

@ -217,7 +217,7 @@ static int collated_compare (const void *, const void *) __THROW;
static const char * static const char *
next_brace_sub (const char *cp, int flags) next_brace_sub (const char *cp, int flags)
{ {
unsigned int depth = 0; size_t depth = 0;
while (*cp != '\0') while (*cp != '\0')
if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\') if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
{ {
@ -960,7 +960,7 @@ glob (pattern, flags, errfunc, pglob)
&& S_ISDIR (st.st_mode)) && S_ISDIR (st.st_mode))
: (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode))))) : (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode)))))
{ {
int newcount = pglob->gl_pathc + pglob->gl_offs; size_t newcount = pglob->gl_pathc + pglob->gl_offs;
char **new_gl_pathv; char **new_gl_pathv;
if (newcount > UINTPTR_MAX - (1 + 1) if (newcount > UINTPTR_MAX - (1 + 1)
@ -1059,7 +1059,7 @@ glob (pattern, flags, errfunc, pglob)
appending the results to PGLOB. */ appending the results to PGLOB. */
for (i = 0; i < dirs.gl_pathc; ++i) for (i = 0; i < dirs.gl_pathc; ++i)
{ {
int old_pathc; size_t old_pathc;
#ifdef SHELL #ifdef SHELL
{ {
@ -1114,7 +1114,7 @@ glob (pattern, flags, errfunc, pglob)
/* No matches. */ /* No matches. */
if (flags & GLOB_NOCHECK) if (flags & GLOB_NOCHECK)
{ {
int newcount = pglob->gl_pathc + pglob->gl_offs; size_t newcount = pglob->gl_pathc + pglob->gl_offs;
char **new_gl_pathv; char **new_gl_pathv;
if (newcount > UINTPTR_MAX - 2 if (newcount > UINTPTR_MAX - 2
@ -1158,7 +1158,7 @@ glob (pattern, flags, errfunc, pglob)
} }
else else
{ {
int old_pathc = pglob->gl_pathc; size_t old_pathc = pglob->gl_pathc;
int orig_flags = flags; int orig_flags = flags;
if (meta & 2) if (meta & 2)