[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1710 - in glibc-package/trunk/debian: . patches patches/all



Author: barbier
Date: 2006-08-08 21:30:12 +0000 (Tue, 08 Aug 2006)
New Revision: 1710

Added:
   glibc-package/trunk/debian/patches/all/submitted-uninitialized-byte-LC_CTYPE.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
New all/submitted-uninitialized-byte-LC_CTYPE.diff patch to fix an
uninitialized byte in LC_CTYPE locale file.


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-08-08 17:17:40 UTC (rev 1709)
+++ glibc-package/trunk/debian/changelog	2006-08-08 21:30:12 UTC (rev 1710)
@@ -1,3 +1,11 @@
+glibc (2.3.6-20) UNRELEASED; urgency=low
+
+  [ Denis Barbier ]
+  * New all/submitted-uninitialized-byte-LC_CTYPE.diff patch to fix an
+    uninitialized byte in LC_CTYPE locale file.
+
+ -- Denis Barbier <barbier@debian.org>  Tue,  8 Aug 2006 23:24:33 +0200
+
 glibc (2.3.6-19) unstable; urgency=low
 
   [ Michael Banck ]

Added: glibc-package/trunk/debian/patches/all/submitted-uninitialized-byte-LC_CTYPE.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/submitted-uninitialized-byte-LC_CTYPE.diff	2006-08-08 17:17:40 UTC (rev 1709)
+++ glibc-package/trunk/debian/patches/all/submitted-uninitialized-byte-LC_CTYPE.diff	2006-08-08 21:30:12 UTC (rev 1710)
@@ -0,0 +1,26 @@
+Submitted as BZ3013
+
+The right fix is to replace
+   iov[2 + elem + offset].iov_len = 1 + (4 - ((total + 1) % 4));
+   total += 1 + (4 - ((total + 1) % 4));
+by
+   iov[2 + elem + offset].iov_len = 4 - total % 4;
+   total += iov[2 + elem + offset].iov_len;
+This will modify LC_CTYPE contents (but should be compatible),
+so enlarge nulbytes in this patch to be very conservative.
+
+This off-by-one error occurs only with fa_IR locale.
+
+Index: glibc-2.3.6/locale/programs/ld-ctype.c
+===================================================================
+--- glibc-2.3.6.orig/locale/programs/ld-ctype.c
++++ glibc-2.3.6/locale/programs/ld-ctype.c
+@@ -883,7 +883,7 @@
+ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ 	      const char *output_path)
+ {
+-  static const char nulbytes[4] = { 0, 0, 0, 0 };
++  static const char nulbytes[5] = { 0, 0, 0, 0, 0 };
+   struct locale_ctype_t *ctype = locale->categories[LC_CTYPE].ctype;
+   const size_t nelems = (_NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1)
+ 			 + ctype->nr_charclass + ctype->map_collection_nr);

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2006-08-08 17:17:40 UTC (rev 1709)
+++ glibc-package/trunk/debian/patches/series	2006-08-08 21:30:12 UTC (rev 1710)
@@ -127,6 +127,7 @@
 all/local-pt_BR.diff -p1
 all/submitted-new-brf-encoding.diff -p0
 all/cvs-iso2022jp-roundtrip.diff
+all/submitted-uninitialized-byte-LC_CTYPE.diff
 
 any/cvs-argp_h.diff -p1
 any/cvs-ctan.diff -p0



Reply to: