From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Date: Thu, 16 Aug 2018 07:50:32 +0000 (+0200) Subject: malloc_simple: calloc: don't call memset if malloc failed X-Git-Tag: v2025.01-rc5-pxa1908~3691 X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B%20%24.Site.BaseURL%20%7D%7Dposts/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=f3da76ea8b4c559ac0dc9206dc1676dde2224cd8;p=u-boot.git 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 <simon.k.r.goldschmidt@gmail.com> Reviewed-by: Marek Vasut <marex@denx.de> --- 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; }