build: Fix undefined behavior in left shift

Spotted by UBSan.

diff --git a/p11-kit/rpc-message.c b/p11-kit/rpc-message.c
index ff48f1d129802a7bfe445ad7fa271f4d1b3cceca..228627e7e81936fe6d7a46e13962c07b81118d38 100644 (file)
--- a/p11-kit/rpc-message.c
+++ b/p11-kit/rpc-message.c
@@ -636,7 +636,7 @@ p11_rpc_buffer_encode_uint32 (unsigned char* data,
 uint32_t
 p11_rpc_buffer_decode_uint32 (unsigned char* ptr)
 {
-       uint32_t val = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
+       uint32_t val = (uint32_t) ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
        return val;
 }
 

diff --git a/trust/utf8.c b/trust/utf8.c
index 72280b51c292d07f24900bfad832665b87334b0e..8d1c6ce6e1ba3bcc159ecba64248a18f370f401f 100644 (file)
--- a/trust/utf8.c
+++ b/trust/utf8.c
@@ -253,7 +253,7 @@ ucs4be_to_uchar (const unsigned char *str,
        if (len < 4)
                return -1;
 
-       *uc = (str[0] << 24 | str[1] << 16 | str[2] << 8 | str[3]);
+       *uc = ((uint32_t) str[0] << 24 | str[1] << 16 | str[2] << 8 | str[3]);
        return 4;
 }