Fix CFI by removing extra cast

FrankYFTang · FrankYFTang · commit c2a4cae149aa · 2020-11-04T00:29:27.000Z
TBR=jshin@chromium.org Bug: 1145094 Change-Id: I35483de9d2473df8177be32a036ba9583158afa6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2517182 Reviewed-by: Frank Tang <ftang@chromium.org>
diff --git a/README.chromium b/README.chromium
@@ -222,7 +222,15 @@ D. Local Modifications
   - patches/restrace.patch
 
 7. Patch Arabic date time pattern back to 67 value to avoid test
-   breakage in 
+   breakage in
    third_party/blink/web_tests/fast/forms/datetimelocal/datetimelocal-appearance-l10n.html
   - patches/ardatepattern.patch
   - https://bugs.chromium.org/p/chromium/issues/detail?id=1139186
+
+8. Patch fix for CFI due to unnecessary cast
+  - patches/fixCFI.patch
+  - updatream PR:
+    https://github.com/unicode-org/icu/pull/1440
+  - updtream bug:
+    https://unicode-org.atlassian.net/browse/ICU-21373
+
diff --git a/patches/fixCFI.patch b/patches/fixCFI.patch
@@ -0,0 +1,13 @@
+diff --git a/source/common/locid.cpp b/source/common/locid.cpp
+index cc25414b..1efe0da9 100644
+--- a/source/common/locid.cpp
++++ b/source/common/locid.cpp
+@@ -1457,7 +1457,7 @@ AliasReplacer::outputToString(
+         int32_t variantsStart = out.length();
+         for (int32_t i = 0; i < variants.size(); i++) {
+              out.append(SEP_CHAR, status)
+-                 .append((const char*)((UVector*)variants.elementAt(i)),
++                 .append((const char*)(variants.elementAt(i)),
+                          status);
+         }
+         T_CString_toUpperCase(out.data() + variantsStart);
diff --git a/source/common/locid.cpp b/source/common/locid.cpp
@@ -1457,7 +1457,7 @@ AliasReplacer::outputToString(
         int32_t variantsStart = out.length();
         for (int32_t i = 0; i < variants.size(); i++) {
              out.append(SEP_CHAR, status)
-                 .append((const char*)((UVector*)variants.elementAt(i)),
+                 .append((const char*)(variants.elementAt(i)),
                          status);
         }
         T_CString_toUpperCase(out.data() + variantsStart);

Original file line number	Diff line number	Diff line change
`@@ -1457,7 +1457,7 @@ AliasReplacer::outputToString(`
`1457`	`1457`	`int32_t variantsStart = out.length();`
`1458`	`1458`	`for (int32_t i = 0; i < variants.size(); i++) {`
`1459`	`1459`	`out.append(SEP_CHAR, status)`
`1460`		`- .append((const char)((UVector)variants.elementAt(i)),`
	`1460`	`+ .append((const char*)(variants.elementAt(i)),`
`1461`	`1461`	`status);`
`1462`	`1462`	`}`
`1463`	`1463`	`T_CString_toUpperCase(out.data() + variantsStart);`