Merge from Chromium at DEPS revision 40.0.2214.38webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-release

This commit was generated by merge_to_master.py.

Change-Id: If3d4d6be21fe0f12c96ed471bc23ccb5941a683b

3 files changed, 45 insertions, 1 deletions

diff --git a/README.chromium b/README.chromium
index f6015a4..bbb7f8d 100644
--- a/README.chromium
+++ b/README.chromium
@@ -245,3 +245,9 @@ This directory contains the source code of ICU 52.1 for C/C++
                      http://bugs.icu-project.org/trac/ticket/11370
                      http://bugs.icu-project.org/trac/ticket/11371
 
+13. Apply the patch for collator
+   - patches/col.patch
+   - No upstream bug filed because the upstream code was completely
+     rewritten during the ICU 53 cycle.
+
+
diff --git a/patches/col.patch b/patches/col.patch
new file mode 100644
index 0000000..aa117fe
--- /dev/null
+++ b/patches/col.patch
@@ -0,0 +1,29 @@
+Index: source/i18n/ucol.cpp
+===================================================================
+--- source/i18n/ucol.cpp	(revision 292709)
++++ source/i18n/ucol.cpp	(working copy)
+@@ -2259,6 +2259,9 @@
+         if (data->pos + 1 == data->endp) {
+             return *(data->pos ++);
+         }
++        if (data->pos >= data->endp) {
++            return (UChar) -1; // return U+FFFF (non-char) to indicate an error
++        }
+     }
+     else {
+         if (innormbuf) {
+@@ -2821,7 +2824,13 @@
+                                 }
+                             }
+                         } else if (U16_IS_LEAD(schar)) {
+-                            miss = U16_GET_SUPPLEMENTARY(schar, getNextNormalizedChar(source));
++                            UChar nextChar = getNextNormalizedChar(source);
++                            const UChar* prevPos = source->pos;
++                            if (U16_IS_TRAIL(nextChar)) {
++                                miss = U16_GET_SUPPLEMENTARY(schar, nextChar);
++                            } else if (prevPos < source->pos) {
++                                goBackOne(source);
++                            }
+                         }
+ 
+                         uint8_t sCC;
diff --git a/source/i18n/ucol.cpp b/source/i18n/ucol.cpp
index b0d819f..e5ff44e 100644
--- a/source/i18n/ucol.cpp
+++ b/source/i18n/ucol.cpp
@@ -2259,6 +2259,9 @@ inline UChar getNextNormalizedChar(collIterate *data)
         if (data->pos + 1 == data->endp) {
             return *(data->pos ++);
         }
+        if (data->pos >= data->endp) {
+            return (UChar) -1; // return U+FFFF (non-char) to indicate an error
+        }
     }
     else {
         if (innormbuf) {
@@ -2821,7 +2824,13 @@ uint32_t ucol_prv_getSpecialCE(const UCollator *coll, UChar ch, uint32_t CE, col
                                 }
                             }
                         } else if (U16_IS_LEAD(schar)) {
-                            miss = U16_GET_SUPPLEMENTARY(schar, getNextNormalizedChar(source));
+                            UChar nextChar = getNextNormalizedChar(source);
+                            const UChar* prevPos = source->pos;
+                            if (U16_IS_TRAIL(nextChar)) {
+                                miss = U16_GET_SUPPLEMENTARY(schar, nextChar);
+                            } else if (prevPos < source->pos) {
+                                goBackOne(source);
+                            }
                         }
 
                         uint8_t sCC;