From 09e34b78eeb6237a87b8ae5fd1860e7a550dccbd Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Thu, 30 Sep 2021 17:19:34 +1000 Subject: [PATCH] Add header guard around malloc(0) returning NULL implementation Make it safe to import the config multiple times without having multiple definition errors. (This prevents errors in the fuzzers in a later patch.) Signed-off-by: Daniel Axtens --- tests/configs/config-wrapper-malloc-0-null.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/configs/config-wrapper-malloc-0-null.h b/tests/configs/config-wrapper-malloc-0-null.h index e7bdbeb9e..b065c2db4 100644 --- a/tests/configs/config-wrapper-malloc-0-null.h +++ b/tests/configs/config-wrapper-malloc-0-null.h @@ -21,6 +21,8 @@ #include "mbedtls/mbedtls_config.h" #include + +#ifndef MBEDTLS_PLATFORM_STD_CALLOC static inline void *custom_calloc( size_t nmemb, size_t size ) { if( nmemb == 0 || size == 0 ) @@ -30,3 +32,4 @@ static inline void *custom_calloc( size_t nmemb, size_t size ) #define MBEDTLS_PLATFORM_MEMORY #define MBEDTLS_PLATFORM_STD_CALLOC custom_calloc +#endif