aboutsummaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-05-25 05:02:35 +0000
committerUlrich Drepper <drepper@redhat.com>2000-05-25 05:02:35 +0000
commitdb33f7d4aef7422140d5e19c440bb5e084fbe186 (patch)
tree6b9f917cc1cc44fe8fea1e0dc2fedd42e9289285 /malloc/malloc.c
parentacb5ee2e561276d64c6e26ef4b82f59a4db5ae90 (diff)
downloadglibc-db33f7d4aef7422140d5e19c440bb5e084fbe186.zip
glibc-db33f7d4aef7422140d5e19c440bb5e084fbe186.tar.gz
glibc-db33f7d4aef7422140d5e19c440bb5e084fbe186.tar.bz2
Update.
* csu/Makefile (routines): Add check_fds. * elf/rtld.c (dl_main): Call __libc_check_standard_fds for SUID binaries. Add various __builtin_expect. * sysdeps/generic/libc-start.c: Move check_fds and helper functions... * sysdeps/generic/check_fds.c: ...here. New file. * malloc/malloc.c (ptmalloc_init): Only enable debugging for SUID binaries if file /etc/suid-debug is available.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 7f33ebf..21cb9d9 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1722,7 +1722,7 @@ ptmalloc_init __MALLOC_P((void))
__malloc_hook = save_malloc_hook;
__free_hook = save_free_hook;
#endif
- if(s) {
+ if(s && (! __libc_enable_secure || access ("/etc/suid-debug", F_OK) == 0)) {
if(s[0]) mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
__malloc_check_init();
}