Don't use variables to set thresholds for SUID binaries.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index eba2a6091513a6d63fbeb2c1df4581d096032f86..98a248b8940c9fc55dd44a0fad5fbea386bab1cb 100644 (file)
--- 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