From 1ddb125e2c2912e5835362c6b9f270f0510545cc Mon Sep 17 00:00:00 2001 From: goldsimon Date: Thu, 23 Mar 2017 12:15:54 +0100 Subject: [PATCH] altcp_tls_mbedtls_mem: fix compiling for sizeof(mem_size_t) < sizeof(size_t) --- src/apps/altcp_tls/altcp_tls_mbedtls_mem.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c index a4a74339..eccb4856 100644 --- a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c +++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c @@ -188,7 +188,13 @@ altcp_mbedtls_free(void *conf, altcp_mbedtls_state_t *state) void * altcp_mbedtls_alloc_config(size_t size) { - void *ret = (altcp_mbedtls_state_t *)mem_malloc(size); + void *ret; + size_t checked_size = (mem_size_t)size; + if (size != checked_size) { + /* allocation too big (mem_size_t overflow) */ + return NULL; + } + ret = (altcp_mbedtls_state_t *)mem_malloc((mem_size_t)size); if (ret != NULL) { memset(ret, 0, size); }