5 files changed, 39 insertions, 23 deletions

diff --git a/dynamic.list b/dynamic.list
index 8b4f2366..686f8eb4 100644
--- a/dynamic.list
+++ b/dynamic.list
@@ -6,6 +6,15 @@ stdin;
 stdout;
 stderr;
 
+malloc;
+calloc;
+realloc;
+free;
+memalign;
+posix_memalign;
+aligned_alloc;
+malloc_usable_size;
+
 timezone;
 daylight;
 tzname;
diff --git a/src/malloc/calloc.c b/src/malloc/calloc.c
deleted file mode 100644
index 436c0b03..00000000
--- a/src/malloc/calloc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdlib.h>
-#include <errno.h>
-
-void *__malloc0(size_t);
-
-void *calloc(size_t m, size_t n)
-{
-	if (n && m > (size_t)-1/n) {
-		errno = ENOMEM;
-		return 0;
-	}
-	return __malloc0(n * m);
-}
diff --git a/src/malloc/lite_malloc.c b/src/malloc/lite_malloc.c
index 701f60b4..29cccb10 100644
--- a/src/malloc/lite_malloc.c
+++ b/src/malloc/lite_malloc.c
@@ -47,4 +47,14 @@ static void *__simple_malloc(size_t n)
 }
 
 weak_alias(__simple_malloc, malloc);
-weak_alias(__simple_malloc, __malloc0);
+
+static void *__simple_calloc(size_t m, size_t n)
+{
+	if (n && m > (size_t)-1/n || malloc != __simple_malloc) {
+		errno = ENOMEM;
+		return 0;
+	}
+	return __simple_malloc(n * m);
+}
+
+weak_alias(__simple_calloc, calloc);
diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c
index 991300cc..5a56e0c5 100644
--- a/src/malloc/malloc.c
+++ b/src/malloc/malloc.c
@@ -368,6 +368,8 @@ void *malloc(size_t n)
 	return CHUNK_TO_MEM(c);
 }
 
+weak_alias(malloc, __internal_malloc);
+
 static size_t mal0_clear(char *p, size_t pagesz, size_t n)
 {
 #ifdef __GNUC__
@@ -386,13 +388,21 @@ static size_t mal0_clear(char *p, size_t pagesz, size_t n)
 	}
 }
 
-void *__malloc0(size_t n)
+void *calloc(size_t m, size_t n)
 {
+	if (n && m > (size_t)-1/n) {
+		errno = ENOMEM;
+		return 0;
+	}
+	n *= m;
 	void *p = malloc(n);
-	if (!p || IS_MMAPPED(MEM_TO_CHUNK(p)))
-		return p;
-	if (n >= PAGE_SIZE)
-		n = mal0_clear(p, PAGE_SIZE, n);
+	if (!p) return p;
+	if (malloc == __internal_malloc) {
+		if (IS_MMAPPED(MEM_TO_CHUNK(p)))
+			return p;
+		if (n >= PAGE_SIZE)
+			n = mal0_clear(p, PAGE_SIZE, n);
+	}
 	return memset(p, 0, n);
 }
 
@@ -558,6 +568,8 @@ void free(void *p)
 		bin_chunk(self);
 }
 
+weak_alias(free, __internal_free);
+
 void __malloc_donate(char *start, char *end)
 {
 	size_t align_start_up = (SIZE_ALIGN-1) & (-(uintptr_t)start - OVERHEAD);
diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c
index 006bd21c..35b67599 100644
--- a/src/malloc/memalign.c
+++ b/src/malloc/memalign.c
@@ -3,9 +3,7 @@
 #include <errno.h>
 #include "libc.h"
 
-/* This function should work with most dlmalloc-like chunk bookkeeping
- * systems, but it's only guaranteed to work with the native implementation
- * used in this library. */
+void __internal_free(void *);
 
 void *__memalign(size_t align, size_t len)
 {
@@ -17,7 +15,7 @@ void *__memalign(size_t align, size_t len)
 		return NULL;
 	}
 
-	if (len > SIZE_MAX - align) {
+	if (len > SIZE_MAX - align || free != __internal_free) {
 		errno = ENOMEM;
 		return NULL;
 	}