From bc8b1a8f90706c7178fc0a128a7a791b85bbe88f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 31 Jul 2019 14:20:46 -0700 Subject: Fixed UBSAN issues --- upb/pb/varint.int.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'upb/pb/varint.int.h') diff --git a/upb/pb/varint.int.h b/upb/pb/varint.int.h index ddda694..ff1ca66 100644 --- a/upb/pb/varint.int.h +++ b/upb/pb/varint.int.h @@ -46,8 +46,12 @@ UPB_INLINE int32_t upb_zzdec_32(uint32_t n) { UPB_INLINE int64_t upb_zzdec_64(uint64_t n) { return (n >> 1) ^ -(int64_t)(n & 1); } -UPB_INLINE uint32_t upb_zzenc_32(int32_t n) { return (n << 1) ^ (n >> 31); } -UPB_INLINE uint64_t upb_zzenc_64(int64_t n) { return (n << 1) ^ (n >> 63); } +UPB_INLINE uint32_t upb_zzenc_32(int32_t n) { + return ((uint32_t)n << 1) ^ (n >> 31); +} +UPB_INLINE uint64_t upb_zzenc_64(int64_t n) { + return ((uint64_t)n << 1) ^ (n >> 63); +} /* Decoding *******************************************************************/ -- cgit v1.2.3