commit e9fcffd089739a21dd42cf20922c09ff4590c0fe
author Dave Rodgman <dave.rodgman@arm.com> Wed Jul 19 15:42:19 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Jul 19 15:43:07 2023 +0100
tree 1aa819147764a78a1b509f7341368edbd5af9d87
parent 5f65acb02bcedc9a8134a18ddd23b4a50efe13ae

Robustness fix to MBEDTLS_LIKELY

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/common.h

diff --git a/library/common.h b/library/common.h
index 839b7d1..2d35814 100644
--- a/library/common.h
+++ b/library/common.h
@@ -291,8 +291,8 @@
 /* Define compiler branch hints */
 #if defined(__has_builtin)
 #if __has_builtin(__builtin_expect)
-#define MBEDTLS_LIKELY(x)       __builtin_expect((x), 1)
-#define MBEDTLS_UNLIKELY(x)     __builtin_expect((x), 0)
+#define MBEDTLS_LIKELY(x)       __builtin_expect(!!(x), 1)
+#define MBEDTLS_UNLIKELY(x)     __builtin_expect(!!(x), 0)
 #endif
 #endif
 #if !defined(MBEDTLS_LIKELY)