about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2022-11-28 21:36:05 +0100
committerptitSeb <sebastien.chev@gmail.com>2022-11-28 21:36:05 +0100
commitde15ee057ac217560d8db24343a9f4648fd30899 (patch)
tree6aedb18f04731fefa10c23197cb090e37780101e /src
parent1d873cc7011321dd001a4eeb8c289c8438009ccf (diff)
downloadbox64-de15ee057ac217560d8db24343a9f4648fd30899.tar.gz
box64-de15ee057ac217560d8db24343a9f4648fd30899.zip
Fixed some tc_mallinfo signature
Diffstat (limited to 'src')
-rw-r--r--src/mallochook.c8
-rw-r--r--src/wrapped/generated/functions_list.txt2
-rw-r--r--src/wrapped/generated/wrappedtcmallocminimaltypes.h2
-rwxr-xr-xsrc/wrapped/wrappedtcmallocminimal_private.h2
4 files changed, 9 insertions, 5 deletions
diff --git a/src/mallochook.c b/src/mallochook.c
index 4f1e01f0..ac9d229f 100644
--- a/src/mallochook.c
+++ b/src/mallochook.c
@@ -95,7 +95,7 @@ GO2(tc_malloc_skip_new_handler_weak, pFL);      \
 GO2(tc_mallocopt, iFii);        \
 GO2(tc_malloc_stats, vFv);      \
 GO2(tc_malloc_skip_new_handler, pFL);           \
-GO2(tc_mallinfo, pFv);          \
+GO2(tc_mallinfo, pFp);          \
 GO2(tc_posix_memalign, iFpLL);  \
 GO2(tc_realloc, pFpL);          \
 
@@ -432,11 +432,11 @@ EXPORT void* my_tc_malloc_skip_new_handler(size_t s)
     return box_calloc(1, s);
 }
 
-EXPORT void* my_tc_mallinfo(void)
+EXPORT void* my_tc_mallinfo(void* p)
 {
     // ignored, returning null stuffs
-    static size_t faked[10] = {0};
-    return faked;
+    memset(p, 0, sizeof(size_t)*10);
+    return p;
 }
 
 EXPORT int my_tc_posix_memalign(void** p, size_t align, size_t size)
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index d3449255..1e46dc5f 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -4052,6 +4052,8 @@ wrappedtbbmallocproxy:
   - _ZnamRKSt9nothrow_t
   - _ZnwmRKSt9nothrow_t
 wrappedtcmallocminimal:
+- pFp:
+  - mallinfo
 - iFpL:
   - munmap
 - pFpLiiii:
diff --git a/src/wrapped/generated/wrappedtcmallocminimaltypes.h b/src/wrapped/generated/wrappedtcmallocminimaltypes.h
index 46d32516..3111efbd 100644
--- a/src/wrapped/generated/wrappedtcmallocminimaltypes.h
+++ b/src/wrapped/generated/wrappedtcmallocminimaltypes.h
@@ -11,11 +11,13 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
+typedef void* (*pFp_t)(void*);
 typedef int64_t (*iFpL_t)(void*, uintptr_t);
 typedef void* (*pFpLiiii_t)(void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
 typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(mallinfo, pFp_t) \
 	GO(munmap, iFpL_t) \
 	GO(mmap, pFpLiiii_t) \
 	GO(mmap64, pFpLiiiI_t)
diff --git a/src/wrapped/wrappedtcmallocminimal_private.h b/src/wrapped/wrappedtcmallocminimal_private.h
index d7fc06da..b1f6b1e8 100755
--- a/src/wrapped/wrappedtcmallocminimal_private.h
+++ b/src/wrapped/wrappedtcmallocminimal_private.h
@@ -16,7 +16,7 @@ GO(__libc_memalign, pFLL)
 GO(__libc_pvalloc, pFL)
 GO(__libc_realloc, pFpL)
 GO(__libc_valloc, pFL)
-GO(mallinfo, pFv)
+GOM(mallinfo, pFEp)
 GO(malloc, pFL)
 //GO(MallocExtension_GetAllocatedSize, 
 //GO(MallocExtension_GetEstimatedAllocatedSize,