From f3da76ea8b4c559ac0dc9206dc1676dde2224cd8 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Thu, 16 Aug 2018 09:50:32 +0200 Subject: [PATCH] malloc_simple: calloc: don't call memset if malloc failed malloc_simple() can return 0 if out of memory. Don't call memset from calloc() in this case but rely on the caller checking the return value. Signed-off-by: Simon Goldschmidt Reviewed-by: Marek Vasut --- common/malloc_simple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/malloc_simple.c b/common/malloc_simple.c index c14f8b59c1..871b5444bd 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -57,7 +57,8 @@ void *calloc(size_t nmemb, size_t elem_size) void *ptr; ptr = malloc(size); - memset(ptr, '\0', size); + if (ptr) + memset(ptr, '\0', size); return ptr; } -- 2.39.5