From acd62e055ee71f330b1d48c3c3c83aaa5ceca29a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 28 Oct 2014 17:29:35 +0100 Subject: [PATCH] external/icu: workaround -fsanitize=signed-integer-overflow warnings Change-Id: I7d8e3be80f04ec0a9d1dbd394ac0e2ab2f1a4551 --- external/icu/icu-ubsan.patch.0 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0 index f3e9d99c33f4..479007beabdc 100644 --- a/external/icu/icu-ubsan.patch.0 +++ b/external/icu/icu-ubsan.patch.0 @@ -127,6 +127,17 @@ length(len), next(subNode) {} virtual UBool operator==(const Node &other) const; virtual int32_t markRightEdgesFirst(int32_t edgeNumber); +--- source/common/uresbund.cpp ++++ source/common/uresbund.cpp +@@ -53,7 +53,7 @@ + UHashTok namekey, pathkey; + namekey.pointer = b->fName; + pathkey.pointer = b->fPath; +- return uhash_hashChars(namekey)+37*uhash_hashChars(pathkey); ++ return uhash_hashChars(namekey)+37U*uhash_hashChars(pathkey); + } + + /* INTERNAL: compares two entries */ --- source/common/ustring.cpp +++ source/common/ustring.cpp @@ -1486,7 +1486,7 @@