[Commits] r20905 - in /fsf/glibc-2_15-branch/libc: ChangeLog NEWS posix/glob.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Sep 28 00:03:07 2012
New Revision: 20905

Log:
Import glibc-2.15 for 2012-09-28

Modified:
    fsf/glibc-2_15-branch/libc/ChangeLog
    fsf/glibc-2_15-branch/libc/NEWS
    fsf/glibc-2_15-branch/libc/posix/glob.c

Modified: fsf/glibc-2_15-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_15-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_15-branch/libc/ChangeLog Fri Sep 28 00:03:07 2012
@@ -1,3 +1,11 @@
+2012-09-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[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@xxxxxxxxxxxxxxxx>
 
 	[BZ #14459]

Modified: fsf/glibc-2_15-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_15-branch/libc/NEWS (original)
+++ fsf/glibc-2_15-branch/libc/NEWS Fri Sep 28 00:03:07 2012
@@ -10,7 +10,8 @@
 * 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
 

Modified: fsf/glibc-2_15-branch/libc/posix/glob.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/posix/glob.c (original)
+++ fsf/glibc-2_15-branch/libc/posix/glob.c Fri Sep 28 00:03:07 2012
@@ -218,7 +218,7 @@
 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 @@
 		  && 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 @@
 	 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 @@
 	  /* 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 @@
     }
   else
     {
-      int old_pathc = pglob->gl_pathc;
+      size_t old_pathc = pglob->gl_pathc;
       int orig_flags = flags;
 
       if (meta & 2)

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits