[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r20903 - in /fsf/glibc-2_16-branch/libc: ChangeLog NEWS posix/glob.c
- To: commits@xxxxxxxxxx
- Subject: [Commits] r20903 - in /fsf/glibc-2_16-branch/libc: ChangeLog NEWS posix/glob.c
- From: eglibc@xxxxxxxxxx
- Date: Fri, 28 Sep 2012 00:02:25 -0000
Author: eglibc
Date: Fri Sep 28 00:02:23 2012
New Revision: 20903
Log:
Import glibc-2.16 for 2012-09-28
Modified:
fsf/glibc-2_16-branch/libc/ChangeLog
fsf/glibc-2_16-branch/libc/NEWS
fsf/glibc-2_16-branch/libc/posix/glob.c
Modified: fsf/glibc-2_16-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_16-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_16-branch/libc/ChangeLog Fri Sep 28 00:02:23 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-09-24 H.J. Lu <hongjiu.lu@xxxxxxxxx>
[BZ #14562]
Modified: fsf/glibc-2_16-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_16-branch/libc/NEWS (original)
+++ fsf/glibc-2_16-branch/libc/NEWS Fri Sep 28 00:02:23 2012
@@ -9,7 +9,7 @@
* The following bugs are resolved with this release:
- 14195, 14459, 14476, 14562
+ 14195, 14459, 14476, 14562, 14621
Version 2.16
Modified: fsf/glibc-2_16-branch/libc/posix/glob.c
==============================================================================
--- fsf/glibc-2_16-branch/libc/posix/glob.c (original)
+++ fsf/glibc-2_16-branch/libc/posix/glob.c Fri Sep 28 00:02:23 2012
@@ -217,7 +217,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 == '\\')
{
@@ -960,7 +960,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)
@@ -1059,7 +1059,7 @@
appending the results to PGLOB. */
for (i = 0; i < dirs.gl_pathc; ++i)
{
- int old_pathc;
+ size_t old_pathc;
#ifdef SHELL
{
@@ -1114,7 +1114,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
@@ -1158,7 +1158,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