diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:57 -0700 |
| commit | c2bfd0f9cba5e94c08dcc1033d39d7bef29be08e (patch) | |
| tree | c1d671df12889509e0c6901f5895b3246a7b2827 /compat | |
| parent | Merge branch 'ks/prepare-commit-msg-sample' (diff) | |
| parent | bswap: convert get_be16, get_be32 and put_be32 to inline functions (diff) | |
| download | tgif-c2bfd0f9cba5e94c08dcc1033d39d7bef29be08e.tar.xz | |
Merge branch 'rs/bswap-ubsan-fix'
Code clean-up.
* rs/bswap-ubsan-fix:
bswap: convert get_be16, get_be32 and put_be32 to inline functions
bswap: convert to unsigned before shifting in get_be32
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/bswap.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/compat/bswap.h b/compat/bswap.h index d47c003544..7d063e9e40 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -162,19 +162,29 @@ static inline uint64_t git_bswap64(uint64_t x) #else -#define get_be16(p) ( \ - (*((unsigned char *)(p) + 0) << 8) | \ - (*((unsigned char *)(p) + 1) << 0) ) -#define get_be32(p) ( \ - (*((unsigned char *)(p) + 0) << 24) | \ - (*((unsigned char *)(p) + 1) << 16) | \ - (*((unsigned char *)(p) + 2) << 8) | \ - (*((unsigned char *)(p) + 3) << 0) ) -#define put_be32(p, v) do { \ - unsigned int __v = (v); \ - *((unsigned char *)(p) + 0) = __v >> 24; \ - *((unsigned char *)(p) + 1) = __v >> 16; \ - *((unsigned char *)(p) + 2) = __v >> 8; \ - *((unsigned char *)(p) + 3) = __v >> 0; } while (0) +static inline uint16_t get_be16(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint16_t)p[0] << 8 | + (uint16_t)p[1] << 0; +} + +static inline uint32_t get_be32(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint32_t)p[0] << 24 | + (uint32_t)p[1] << 16 | + (uint32_t)p[2] << 8 | + (uint32_t)p[3] << 0; +} + +static inline void put_be32(void *ptr, uint32_t value) +{ + unsigned char *p = ptr; + p[0] = value >> 24; + p[1] = value >> 16; + p[2] = value >> 8; + p[3] = value >> 0; +} #endif |