lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-05-28 16:21:27 +03:00
Code

Make malloc-0-null a user config file

Browse Source 
Having a wrapper made it harder to use: incompatible with setting
MBEDTLS_CONFIG_FILE, harder to combine with other settings. It was also
surprising since it was the only test config that was structured in that
way.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-07-20 19:00:15 +02:00
parent d4c85af9ce
commit 2e70f1c952
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/configs/config-wrapper-malloc-0-null.h → tests/configs/user-config-malloc-0-null.h
View File

@ -1,4 +1,4 @@
/* config.h wrapper that forces calloc(0) to return NULL. /* config.h modifier that forces calloc(0) to return NULL.
* Used for testing. * Used for testing.
*/ */
/* /*
@ -18,11 +18,6 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef MBEDTLS_CONFIG_H
/* Don't #define MBEDTLS_CONFIG_H, let config.h do it. */
#include "mbedtls/config.h"
#include <stdlib.h> #include <stdlib.h>
#ifndef MBEDTLS_PLATFORM_STD_CALLOC #ifndef MBEDTLS_PLATFORM_STD_CALLOC
@ -37,5 +32,3 @@ static inline void *custom_calloc(size_t nmemb, size_t size)
#define MBEDTLS_PLATFORM_MEMORY #define MBEDTLS_PLATFORM_MEMORY
#define MBEDTLS_PLATFORM_STD_CALLOC custom_calloc #define MBEDTLS_PLATFORM_STD_CALLOC custom_calloc
#endif #endif
#endif /* MBEDTLS_CONFIG_H */

2
tests/scripts/all.sh
View File

@ -2822,7 +2822,7 @@ component_test_platform_calloc_macro () {
component_test_malloc_0_null () { component_test_malloc_0_null () {
msg "build: malloc(0) returns NULL (ASan+UBSan build)" msg "build: malloc(0) returns NULL (ASan+UBSan build)"
scripts/config.py full scripts/config.py full
make CC=gcc CFLAGS="'-DMBEDTLS_CONFIG_FILE=\"$PWD/tests/configs/config-wrapper-malloc-0-null.h\"' $ASAN_CFLAGS -O" LDFLAGS="$ASAN_CFLAGS" make CC=gcc CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"$PWD/tests/configs/user-config-malloc-0-null.h\"' $ASAN_CFLAGS -O" LDFLAGS="$ASAN_CFLAGS"
msg "test: malloc(0) returns NULL (ASan+UBSan build)" msg "test: malloc(0) returns NULL (ASan+UBSan build)"
make test make test