This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Use size_t instead of int for internal variables in glob (bug14621)
And here is the 2.15 branch version (again, tested x86_64 and x86). OK
for 2.15 branch?
diff --git a/ChangeLog b/ChangeLog
index b4b6254..a0b960c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-08-27 Joseph Myers <joseph@codesourcery.com>
[BZ #14459]
diff --git a/NEWS b/NEWS
index 7869476..ad50068 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,8 @@ Version 2.15.1
* The following bugs are resolved with this release:
411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
- 13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459
+ 13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
+ 14621
Version 2.15
diff --git a/posix/glob.c b/posix/glob.c
index 89c8775..a44f4cc 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -218,7 +218,7 @@ static int collated_compare (const void *, const void *) __THROW;
static const char *
next_brace_sub (const char *cp, int flags)
{
- unsigned int depth = 0;
+ size_t depth = 0;
while (*cp != '\0')
if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
{
@@ -961,7 +961,7 @@ glob (pattern, flags, errfunc, pglob)
&& S_ISDIR (st.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;
if (newcount > UINTPTR_MAX - (1 + 1)
@@ -1060,7 +1060,7 @@ glob (pattern, flags, errfunc, pglob)
appending the results to PGLOB. */
for (i = 0; i < dirs.gl_pathc; ++i)
{
- int old_pathc;
+ size_t old_pathc;
#ifdef SHELL
{
@@ -1115,7 +1115,7 @@ glob (pattern, flags, errfunc, pglob)
/* No matches. */
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;
if (newcount > UINTPTR_MAX - 2
@@ -1159,7 +1159,7 @@ glob (pattern, flags, errfunc, pglob)
}
else
{
- int old_pathc = pglob->gl_pathc;
+ size_t old_pathc = pglob->gl_pathc;
int orig_flags = flags;
if (meta & 2)
--
Joseph S. Myers
joseph@codesourcery.com