| commit | 203082b8217cd853eee510ad371b382701960610 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Mar 27 22:55:20 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 27 22:55:20 2015 +0000 |
| tree | 5042f453214b2d176c601710c87350c30c7f3944 | |
| parent | 5c136382a6f1ad796a60463898d4c08fadead669 [diff] | |
| parent | e001ca3e18b085661868be9a77bd18bea587780c [diff] |
Merge "linker_environ: clear MALLOC_CONF when AT_SECURE=1"
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",