commit 0a936d104922065fdfde80a6c9a328086d3dcad3
author Laszlo Csomor <laszlocsomor@google.com> Wed May 31 09:47:43 2017 +0200
committer László Csomor <laszlocsomor@google.com> Wed May 31 13:44:26 2017 +0200
tree 6478a270235113f0087c8e2e2aecfacc75bd8aaa
parent 74cea8368d00ed222b5afee4022208022918eb8f

Windows: ignore envvars with degenerate names

Fixes https://github.com/bazelbuild/bazel/issues/3077

Change-Id: I5f29fdec1f69bdda51fa62be695b8791a45240e9
PiperOrigin-RevId: 157559455

src/main/cpp/option_processor.cc

diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index 9e750c5..553682f 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -481,6 +481,18 @@
   return blaze_exit_code::SUCCESS;
 }
 
+static bool IsValidEnvName(const char* p) {
+#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+  for (; *p && *p != '='; ++p) {
+    if (!((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') ||
+          (*p >= '0' && *p <= '9') || *p == '_')) {
+      return false;
+    }
+  }
+#endif
+  return true;
+}
+
 #if defined(COMPILER_MSVC)
 static void PreprocessEnvString(string* env_str) {
   static std::set<string> vars_to_uppercase = {"PATH", "TMP", "TEMP", "TEMPDIR",
@@ -558,8 +570,10 @@
   // Pass the client environment to the server.
   for (char** env = environ; *env != NULL; env++) {
     string env_str(*env);
-    PreprocessEnvString(&env_str);
-    command_arguments_.push_back("--client_env=" + env_str);
+    if (IsValidEnvName(*env)) {
+      PreprocessEnvString(&env_str);
+      command_arguments_.push_back("--client_env=" + env_str);
+    }
   }
   command_arguments_.push_back("--client_cwd=" + blaze::ConvertPath(cwd));