summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorrohitrao <rohitrao@chromium.org>2015-05-11 17:26:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-12 00:27:55 +0000
commitbf21714b4e5432f50f1ca9d7190109e7d322e917 (patch)
tree9278d3f06e49d128c8b6dc39dce7697cbceebcb5 /base/json
parent6b28a8e582113e0417dc2fecc54c324a902fe9ec (diff)
downloadchromium_src-bf21714b4e5432f50f1ca9d7190109e7d322e917.zip
chromium_src-bf21714b4e5432f50f1ca9d7190109e7d322e917.tar.gz
chromium_src-bf21714b4e5432f50f1ca9d7190109e7d322e917.tar.bz2
Fix JSONStringEscapeTest.EscapeBytes on iOS.
Clang has an apparent bug on arm64 which causes it to replace elements of the |cases| array with garbage. Removing \0 from the end of the string constant works around this bug. Tracked in https://llvm.org/bugs/show_bug.cgi?id=23437. BUG=477682 TEST=Arm64 iOS bots go green. Review URL: https://codereview.chromium.org/1132063004 Cr-Commit-Position: refs/heads/master@{#329294}
Diffstat (limited to 'base/json')
-rw-r--r--base/json/string_escape_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/json/string_escape_unittest.cc b/base/json/string_escape_unittest.cc
index 3eb4e8e..100373f 100644
--- a/base/json/string_escape_unittest.cc
+++ b/base/json/string_escape_unittest.cc
@@ -159,7 +159,7 @@ TEST(JSONStringEscapeTest, EscapeBytes) {
const char* escaped;
} cases[] = {
{"b\x0f\x7f\xf0\xff!", "b\\u000F\\u007F\\u00F0\\u00FF!"},
- {"\xe5\xc4\x4f\x05\xb6\xfd\0", "\\u00E5\\u00C4O\\u0005\\u00B6\\u00FD"},
+ {"\xe5\xc4\x4f\x05\xb6\xfd", "\\u00E5\\u00C4O\\u0005\\u00B6\\u00FD"},
};
for (size_t i = 0; i < arraysize(cases); ++i) {