summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorSteven J. Magnani <steve@digidescorp.com>2010-06-09 09:02:21 -0500
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-07-27 13:25:45 +0200
commit8a08aeeaa08bdad0ac577a9c7840f01cab1122c1 (patch)
treeb9a7f573c85d9a74d8ff805198e62197c03947bf /libc
parent8642946bd00e0c6dff9f08d84a63d32ce6648538 (diff)
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 <steve@digidescorp.com> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc')
-rw-r--r--libc/stdlib/malloc-simple/alloc.c9
1 files changed, 4 insertions, 5 deletions
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);
}