From 5811bd184c3a72ab9ab0cd0f955168627b77aed2 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 3 Oct 2018 17:17:20 -0400 Subject: [PATCH] avoid unnecessary preprocessor use for canary mask --- malloc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/malloc.c b/malloc.c index 18772c7..dd7b794 100644 --- a/malloc.c +++ b/malloc.c @@ -274,11 +274,9 @@ static void write_after_free_check(char *p, size_t size) { } } -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -static const uint64_t canary_mask = 0xffffffffffffff00UL; -#else -static const uint64_t canary_mask = 0x00ffffffffffffffUL; -#endif +static const uint64_t canary_mask = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ? + 0xffffffffffffff00UL : + 0x00ffffffffffffffUL; static void set_canary(struct slab_metadata *metadata, void *p, size_t size) { memcpy((char *)p + size - canary_size, &metadata->canary_value, canary_size);