summaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c5
-rw-r--r--malloc/mcheck.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 3bf4910651..ba32992999 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1702,8 +1702,6 @@ malloc_hook_ini(sz) size_t sz;
#endif
{
__malloc_hook = NULL;
- __realloc_hook = NULL;
- __memalign_hook = NULL;
ptmalloc_init();
return mALLOc(sz);
}
@@ -1718,7 +1716,6 @@ realloc_hook_ini(ptr, sz, caller)
{
__malloc_hook = NULL;
__realloc_hook = NULL;
- __memalign_hook = NULL;
ptmalloc_init();
return rEALLOc(ptr, sz);
}
@@ -1731,8 +1728,6 @@ memalign_hook_ini(sz, alignment, caller)
size_t sz; size_t alignment; const __malloc_ptr_t caller;
#endif
{
- __malloc_hook = NULL;
- __realloc_hook = NULL;
__memalign_hook = NULL;
ptmalloc_init();
return mEMALIGn(sz, alignment);
diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index 4547a31299..c5baa3d4a7 100644
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -246,5 +246,5 @@ mcheck (func)
enum mcheck_status
mprobe (__ptr_t ptr)
{
- return mcheck_used ? checkhdr (ptr) : MCHECK_DISABLED;
+ return mcheck_used ? checkhdr (((struct hdr *) ptr) - 1) : MCHECK_DISABLED;
}