aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-28 09:29:49 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-28 09:29:49 +0000
commit997a416551a7d5ceb91978674cb8c70b443329d0 (patch)
tree06eeaeff7d435927b4ccac073613683a90a71116 /malloc
parent0b49f866c517f5098e0ee705a15d5ad50f378779 (diff)
downloadglibc-997a416551a7d5ceb91978674cb8c70b443329d0.tar
glibc-997a416551a7d5ceb91978674cb8c70b443329d0.tar.gz
glibc-997a416551a7d5ceb91978674cb8c70b443329d0.tar.bz2
glibc-997a416551a7d5ceb91978674cb8c70b443329d0.zip
Update.
1998-08-28 09:22 Ulrich Drepper <drepper@cygnus.com> * 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 <phil@fifi.org>. * malloc/mcheck.c (mprobe): Call checkhdr with adjusted pointer. Patch by Philippe Troin <phil@fifi.org>. 1998-08-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * 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 <schwab@issan.informatik.uni-dortmund.de> * debug/Makefile (distribute): Add register-dump.h. 1998-08-28 10:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
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;
}