diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 10:52:23 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 16:57:35 +0000 |
commit | 7b79fa930917da735f02b4f6911dfbb0a91f9714 (patch) | |
tree | 99c402155552fc6ac6a1d14b2785acbb580282a8 /libstdc++-v3/libsupc++ | |
parent | f7a41b5cfd7406da1f2e5a0f1f813521d3dc2bb2 (diff) | |
download | gcc-7b79fa930917da735f02b4f6911dfbb0a91f9714.zip gcc-7b79fa930917da735f02b4f6911dfbb0a91f9714.tar.gz gcc-7b79fa930917da735f02b4f6911dfbb0a91f9714.tar.bz2 |
libstdc++: Fix _Hash_bytes for I16LP32 targets [PR107885]
For H8/300 size_t is 32 bits wide, but (unsigned char)buf[2] << 16
promotes to int which is only 16 bits wide. The shift is then undefined.
This fixes it by converting to size_t before shifting.
libstdc++-v3/ChangeLog:
PR libstdc++/107885
* libsupc++/hash_bytes.cc (_Hash_bytes): Convert to size_t
instead of implicit integer promotion to 16 bits.
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r-- | libstdc++-v3/libsupc++/hash_bytes.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/libsupc++/hash_bytes.cc b/libstdc++-v3/libsupc++/hash_bytes.cc index ffdd04f..67e2dbb 100644 --- a/libstdc++-v3/libsupc++/hash_bytes.cc +++ b/libstdc++-v3/libsupc++/hash_bytes.cc @@ -90,17 +90,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION len -= 4; } + size_t k; // Handle the last few bytes of the input array. switch(len) { case 3: - hash ^= static_cast<unsigned char>(buf[2]) << 16; + k = static_cast<unsigned char>(buf[2]); + hash ^= k << 16; [[gnu::fallthrough]]; case 2: - hash ^= static_cast<unsigned char>(buf[1]) << 8; + k = static_cast<unsigned char>(buf[1]); + hash ^= k << 8; [[gnu::fallthrough]]; case 1: - hash ^= static_cast<unsigned char>(buf[0]); + k = static_cast<unsigned char>(buf[0]); + hash ^= k; hash *= m; }; |