Wrapped malloc to call calloc instead (not sure it's really needed)

2 files changed, 3 insertions, 6 deletions

diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 9262060b..5807bb37 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -2092,15 +2092,12 @@ EXPORT int my_nanosleep(const struct timespec *req, struct timespec *rem)
         return 0;   // workaround for some strange calls
     return nanosleep(req, rem);
 }
-
-#ifndef NOALIGN
-// wrapped malloc using calloc, it seems x86 malloc set alloc'd block to zero somehow
+#endif
 EXPORT void* my_malloc(unsigned long size)
 {
     return calloc(1, size);
 }
-#endif
-
+#if 0
 #ifdef PANDORA
 #define RENAME_NOREPLACE	(1 << 0)
 #define RENAME_EXCHANGE		(1 << 1)
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index 880d8561..0d5730fe 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -1100,7 +1100,7 @@ GO(__madvise, iFpLi)
 GOW(madvise, iFpLi)
 GOM(makecontext, iFEppiV)   //weak
 //GOW(mallinfo, 
-GO(malloc, pFL) // need to wrap to clear allocated memory?
+GOM(malloc, pFL) // need to wrap to clear allocated memory?
 //GO(malloc_get_state, 
 //GOW(malloc_info, 
 //GO(malloc_set_state,