src: Fix hash calculation because of signed integer promotion

This commit is contained in:
Tatsuhiro Tsujikawa 2016-07-06 23:50:48 +09:00
parent 42ea5abdcb
commit 536e40aeaa
1 changed files with 6 additions and 4 deletions

View File

@ -75,8 +75,9 @@ int compute_hash_values(std::vector<uint64_t> &hash_values,
v = (static_cast<uint64_t>(md[24]) << 56) + v = (static_cast<uint64_t>(md[24]) << 56) +
(static_cast<uint64_t>(md[25]) << 48) + (static_cast<uint64_t>(md[25]) << 48) +
(static_cast<uint64_t>(md[26]) << 40) + (static_cast<uint64_t>(md[26]) << 40) +
(static_cast<uint64_t>(md[27]) << 32) + (md[28] << 24) + (static_cast<uint64_t>(md[27]) << 32) +
(md[29] << 16) + (md[30] << 8) + md[31]; (static_cast<uint64_t>(md[28]) << 24) + (md[29] << 16) + (md[30] << 8) +
md[31];
v &= mask; v &= mask;
*p++ = v; *p++ = v;
@ -252,8 +253,9 @@ int cache_digest_hash(uint64_t &key, size_t nbits, const StringRef &s) {
key = (static_cast<uint64_t>(md[24]) << 56) + key = (static_cast<uint64_t>(md[24]) << 56) +
(static_cast<uint64_t>(md[25]) << 48) + (static_cast<uint64_t>(md[25]) << 48) +
(static_cast<uint64_t>(md[26]) << 40) + (static_cast<uint64_t>(md[26]) << 40) +
(static_cast<uint64_t>(md[27]) << 32) + (md[28] << 24) + (static_cast<uint64_t>(md[27]) << 32) +
(md[29] << 16) + (md[30] << 8) + md[31]; (static_cast<uint64_t>(md[28]) << 24) + (md[29] << 16) + (md[30] << 8) +
md[31];
key &= mask; key &= mask;