[Commits] r24005 - in /fsf/trunk/libc: ChangeLog NEWS locale/programs/ld-ctype.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Sep 14 00:01:58 2013
New Revision: 24005

Log:
Import glibc-mainline for 2013-09-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/locale/programs/ld-ctype.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Sep 14 00:01:58 2013
@@ -1,3 +1,10 @@
+2013-09-13  Richard Sandiford  <richard@xxxxxxxxxxxxxxxx>
+
+	* locale/programs/ld-ctype.c (find_idx): Use uint32_t in
+	prototype.
+	(ctype_startup): Use uint32_t in cast and sizeof for
+	ctype->charnames.
+
 2013-09-11  Jia Liu  <proljc@xxxxxxxxx>
 
 	* sunrpc/rpc/types.h [__APPLE_CC__]: Define __u_char_defined and

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Sep 14 00:01:58 2013
@@ -16,6 +16,11 @@
 * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
   to the d_name member of struct dirent, or omit the terminating NUL
   character.  (Bugzilla #14699).
+
+* CVE-2013-4332 The pvalloc, valloc, memalign, posix_memalign and
+  aligned_alloc functions could allocate too few bytes or corrupt the
+  heap when passed very large allocation size values (Bugzilla #15855,
+  #15856, #15857).
 
 * New locales: quz_PE.
 

Modified: fsf/trunk/libc/locale/programs/ld-ctype.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-ctype.c (original)
+++ fsf/trunk/libc/locale/programs/ld-ctype.c Sat Sep 14 00:01:58 2013
@@ -270,7 +270,7 @@
 			   struct locale_ctype_t *ctype,
 			   const char *name, const struct charmap_t *charmap);
 static uint32_t *find_idx (struct locale_ctype_t *ctype, uint32_t **table,
-			   size_t *max, size_t *act, unsigned int idx);
+			   size_t *max, size_t *act, uint32_t idx);
 static void set_class_defaults (struct locale_ctype_t *ctype,
 				const struct charmap_t *charmap,
 				struct repertoire_t *repertoire);
@@ -311,9 +311,8 @@
 
 	  /* We have seen no names yet.  */
 	  ctype->charnames_max = charmap->mb_cur_max == 1 ? 256 : 512;
-	  ctype->charnames =
-	    (unsigned int *) xmalloc (ctype->charnames_max
-				      * sizeof (unsigned int));
+	  ctype->charnames = (uint32_t *) xmalloc (ctype->charnames_max
+						   * sizeof (uint32_t));
 	  for (cnt = 0; cnt < 256; ++cnt)
 	    ctype->charnames[cnt] = cnt;
 	  ctype->charnames_act = 256;

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