am 203082b8: Merge "linker_environ: clear MALLOC_CONF when AT_SECURE=1"

* commit '203082b8217cd853eee510ad371b382701960610': linker_environ: clear MALLOC_CONF when AT_SECURE=1
2015-03-27 23:22:04 +00:00
parent 267422ac85 203082b821
commit c9397b74a9
1 changed files with 2 additions and 0 deletions
--- a/linker/linker_environ.cpp
+++ b/linker/linker_environ.cpp
@@ -115,6 +115,7 @@ static bool __is_unsafe_environment_variable(const char* name) {
      "GCONV_PATH",
      "GETCONF_DIR",
      "HOSTALIASES",
+      "JE_MALLOC_CONF",
      "LD_AOUT_LIBRARY_PATH",
      "LD_AOUT_PRELOAD",
      "LD_AUDIT",
@@ -130,6 +131,7 @@ static bool __is_unsafe_environment_variable(const char* name) {
      "LOCALDOMAIN",
      "LOCPATH",
      "MALLOC_CHECK_",
+      "MALLOC_CONF",
      "MALLOC_TRACE",
      "NIS_PATH",
      "NLSPATH",