diff options
author | Yi Kong <yikong@google.com> | 2024-02-20 06:23:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-20 06:23:05 +0000 |
commit | 3b1cd386e1539c56dfe235ccc82d4b9834e719d5 (patch) | |
tree | 9b29ee7888dd33aceba727a6654ff6ddc145850f | |
parent | 315a0f14a6cbfbb14036ddf9a38677e30e48656f (diff) | |
parent | 93926f65a4abb5528d46c0fa32bc628b7a085c9c (diff) | |
download | native-3b1cd386e1539c56dfe235ccc82d4b9834e719d5.tar.gz |
Merge "Turn off integer overflow UBSAN checks for hash functions" into main
-rw-r--r-- | libs/ui/DisplayIdentification.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ui/DisplayIdentification.cpp b/libs/ui/DisplayIdentification.cpp index a45ffe1a19..82e5427317 100644 --- a/libs/ui/DisplayIdentification.cpp +++ b/libs/ui/DisplayIdentification.cpp @@ -47,6 +47,7 @@ uint64_t shiftMix(uint64_t val) { return val ^ (val >> 47); } +__attribute__((no_sanitize("unsigned-integer-overflow"))) uint64_t hash64Len16(uint64_t u, uint64_t v) { constexpr uint64_t kMul = 0x9ddfea08eb382d69; uint64_t a = (u ^ v) * kMul; @@ -57,6 +58,7 @@ uint64_t hash64Len16(uint64_t u, uint64_t v) { return b; } +__attribute__((no_sanitize("unsigned-integer-overflow"))) uint64_t hash64Len0To16(const char* s, uint64_t len) { constexpr uint64_t k2 = 0x9ae16a3b2f90404f; constexpr uint64_t k3 = 0xc949d7c7509e6557; @@ -401,4 +403,4 @@ uint64_t cityHash64Len0To16(std::string_view sv) { return hash64Len0To16(sv.data(), len); } -} // namespace android
\ No newline at end of file +} // namespace android |