From 997a416551a7d5ceb91978674cb8c70b443329d0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 28 Aug 1998 09:29:49 +0000 Subject: Update. 1998-08-28 09:22 Ulrich Drepper * elf/rtld.c (process_envvars): Fix copy&paste error. * malloc/malloc.c (malloc_hook_ini): Don't overwrite realloc and memalign hook. (realloc_hook_ini): Don't overwrite memalign hook. (memalign_hook_ini): Don't overwrite malloc and memalign hooks. Reported by Philippe Troin . * malloc/mcheck.c (mprobe): Call checkhdr with adjusted pointer. Patch by Philippe Troin . 1998-08-26 Andreas Schwab * sysdeps/generic/segfault.c (install_handler): Protect the non-POSIX signals with #ifdef. (catch_segfault): Add missing mode parameter for open. * debug/catchsegv.sh: Avoid termination message from shell. Allow other termination signals. 1998-08-27 Andreas Schwab * debug/Makefile (distribute): Add register-dump.h. 1998-08-28 10:41 Andreas Schwab --- malloc/malloc.c | 5 ----- malloc/mcheck.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'malloc') 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; } -- cgit v1.2.3