libstdc++: Fix _Hash_bytes for I16LP32 targets [PR107885]
authorJonathan Wakely <jwakely@redhat.com>
Mon, 28 Nov 2022 10:52:23 +0000 (10:52 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Mon, 28 Nov 2022 16:57:35 +0000 (16:57 +0000)
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.

libstdc++-v3/libsupc++/hash_bytes.cc

index ffdd04f..67e2dbb 100644 (file)
@@ -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;
       };