icu: switch to 4.2.1 from RHEL-6

1 files changed, 22 insertions, 0 deletions

diff --git a/canonicalize.patch b/canonicalize.patch
new file mode 100644
index 0000000..87a75a0
--- /dev/null
+++ b/canonicalize.patch
@@ -0,0 +1,22 @@
+Index: source/common/uloc.c
+===================================================================
+--- source/common/uloc.c	(revision 113138)
++++ source/common/uloc.c	(working copy)
+@@ -1797,7 +1797,7 @@
+                 int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
+                 len -= variantLen;
+                 if (variantLen > 0) {
+-                    if (name[len-1] == '_') { /* delete trailing '_' */
++                    if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
+                         --len;
+                     }
+                     addKeyword = VARIANT_MAP[j].keyword;
+@@ -1805,7 +1805,7 @@
+                     break;
+                 }
+             }
+-            if (name[len-1] == '_') { /* delete trailing '_' */
++            if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
+                 --len;
+             }
+         }