From 8a08aeeaa08bdad0ac577a9c7840f01cab1122c1 Mon Sep 17 00:00:00 2001 From: "Steven J. Magnani" Date: Wed, 9 Jun 2010 09:02:21 -0500 Subject: malloc-simple: Make calloc() return zeroed memory The 0.9.31 release included a change to malloc-simple to request uninitialized memory from noMMU kernels. Unfortunately, the corresponding calloc() code assumed that memory returned by malloc() was already zeroed, which leads to all kinds of nastiness. Signed-off-by: Steven J. Magnani Signed-off-by: Bernhard Reutner-Fischer --- libc/stdlib/malloc-simple/alloc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libc/stdlib/malloc-simple') diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index 51da14ac8..914c89dc0 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -60,11 +60,10 @@ void * calloc(size_t nmemb, size_t lsize) __set_errno(ENOMEM); return NULL; } - result=malloc(size); -#if 0 - /* Standard unix mmap using /dev/zero clears memory so calloc - * doesn't need to actually zero anything.... - */ + result = malloc(size); + +#ifndef __ARCH_USE_MMU__ + /* mmap'd with MAP_UNINITIALIZE, we have to blank memory ourselves */ if (result != NULL) { memset(result, 0, size); } -- cgit v1.2.3