diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-28 22:34:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-28 22:34:29 +0000 |
| commit | d01d63190bf60f378406ea2846a35790a1d144f6 (patch) | |
| tree | ffe7b3396a6ea4a3749b24779c37a5dcb19bf37a /malloc | |
| parent | a125d9b46eb8e57cd67542c992d7d1c84e563b58 (diff) | |
| download | glibc-d01d63190bf60f378406ea2846a35790a1d144f6.tar.gz | |
Update.
1999-08-28 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.c (ptmalloc_init): Don't use variables to set
thresholds for SUID binaries. [PR libc/1277]
1999-08-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/install.texi (Running make install): Give examples for
timezone and locale installation.
1999-08-28 Zack Weinberg <zack@bitmover.com>
* glibcbug.in: Get CCVERSION from autoconf substitution.
* configure.in: Calculate and substitute CCVERSION.
1999-08-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Fix sa_flags,
partially reverting a patch from 1998-12-29. We just can't change
the flags, kernels with different flags lead to
incompatibilities.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index eba2a60915..98a248b894 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -305,6 +305,10 @@ # include <sys/types.h> #endif +#ifndef _LIBC +# define __secure_getenv(Str) getenv (Str) +#endif + /* Macros for handling mutexes and thread-specific data. This is included early, because some thread-related header files (such as pthread.h) should be included before any others. */ @@ -1674,13 +1678,13 @@ ptmalloc_init __MALLOC_P((void)) thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all); #endif /* !defined NO_THREADS */ #if defined _LIBC || defined MALLOC_HOOKS - if((s = getenv("MALLOC_TRIM_THRESHOLD_"))) + if((s = __secure_getenv("MALLOC_TRIM_THRESHOLD_"))) mALLOPt(M_TRIM_THRESHOLD, atoi(s)); - if((s = getenv("MALLOC_TOP_PAD_"))) + if((s = __secure_getenv("MALLOC_TOP_PAD_"))) mALLOPt(M_TOP_PAD, atoi(s)); - if((s = getenv("MALLOC_MMAP_THRESHOLD_"))) + if((s = __secure_getenv("MALLOC_MMAP_THRESHOLD_"))) mALLOPt(M_MMAP_THRESHOLD, atoi(s)); - if((s = getenv("MALLOC_MMAP_MAX_"))) + if((s = __secure_getenv("MALLOC_MMAP_MAX_"))) mALLOPt(M_MMAP_MAX, atoi(s)); s = getenv("MALLOC_CHECK_"); #ifndef NO_THREADS |