am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"

* commit '1b34228bb289723c4ba0534eae57d0d085a3d0fa': Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 11:14:01 -08:00
parent e611fad0d0 1b34228bb2
commit 30894bdfd6
1 changed files with 1 additions and 0 deletions
--- a/linker/linker_environ.cpp
+++ b/linker/linker_environ.cpp
@@ -112,6 +112,7 @@ static bool __is_valid_environment_variable(const char* name) {
 static bool __is_unsafe_environment_variable(const char* name) {
  // None of these should be allowed in setuid programs.
  static const char* const UNSAFE_VARIABLE_NAMES[] = {
+      "ANDROID_PROPERTY_WORKSPACE",
      "GCONV_PATH",
      "GETCONF_DIR",
      "HOSTALIASES",