commit e001ca3e18b085661868be9a77bd18bea587780c
author Nick Kralevich <nnk@google.com> Fri Mar 27 14:01:00 2015 -0700
committer Nick Kralevich <nnk@google.com> Fri Mar 27 15:49:33 2015 -0700
tree 89ed57c9b448c5e76c4ca6695a74d395d7022f02
parent cd79a59b18f8e81b5f37258f376a726dc8acb81a

linker_environ: clear MALLOC_CONF when AT_SECURE=1

Clear JE_MALLOC_CONF and MALLOC_CONF

Change-Id: Ia76e263783194ecaa362e8ccafbe13a28a4a1ba6

linker/linker_environ.cpp

diff --git a/linker/linker_environ.cpp b/linker/linker_environ.cpp
index 7272f4e..9a0f009 100644
--- a/linker/linker_environ.cpp
+++ b/linker/linker_environ.cpp
@@ -115,6 +115,7 @@
       "GCONV_PATH",
       "GETCONF_DIR",
       "HOSTALIASES",
+      "JE_MALLOC_CONF",
       "LD_AOUT_LIBRARY_PATH",
       "LD_AOUT_PRELOAD",
       "LD_AUDIT",
@@ -130,6 +131,7 @@
       "LOCALDOMAIN",
       "LOCPATH",
       "MALLOC_CHECK_",
+      "MALLOC_CONF",
       "MALLOC_TRACE",
       "NIS_PATH",
       "NLSPATH",