Don't include TMPDIR in X server environment

remoting/host/linux/linux_me2me_host.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 452 matching lines @@
     self.child_env["PULSE_STATE_PATH"] = pulse_path
     self.child_env["PULSE_SINK"] = sink_name
     self.pulseaudio_pipe = pipe_name
 
     return True
 
   def _setup_gnubby(self):
     self.ssh_auth_sockname = ("/tmp/chromoting.%s.ssh_auth_sock" %
                               os.environ["USER"])
 
+  # Returns child environment not containing TMPDIR.
+  # Certain values of TMPDIR can break the X server (crbug.com/672684), so we
+  # want to make sure it isn't set in the envirionment we use to start the
+  # server.
+  def _x_env(self):
+    if "TMPDIR" not in self.child_env:
+      return self.child_env
+    else:
+      env_copy = dict(self.child_env)
+      del env_copy["TMPDIR"]
+      return env_copy
+
   def _wait_for_x(self):
     # Wait for X to be active.
     with open(os.devnull, "r+") as devnull:
       for _test in range(20):
         exit_code = subprocess.call("xdpyinfo", env=self.child_env,
                                     stdout=devnull)
         if exit_code == 0:
           break
         time.sleep(0.5)
       if exit_code != 0:
@@ skipping 10 matching lines @@
       xvfb = "Xvfb"
 
     logging.info("Starting %s on display :%d" % (xvfb, display))
     screen_option = "%dx%dx24" % (max_width, max_height)
     self.x_proc = subprocess.Popen(
         [xvfb, ":%d" % display,
          "-auth", x_auth_file,
          "-nolisten", "tcp",
          "-noreset",
          "-screen", "0", screen_option
-        ] + extra_x_args, env=self.child_env)
+        ] + extra_x_args, env=self._x_env())
     if not self.x_proc.pid:
       raise Exception("Could not start Xvfb.")
 
     self._wait_for_x()
 
     with open(os.devnull, "r+") as devnull:
       exit_code = subprocess.call("xrandr", env=self.child_env,
                                   stdout=devnull, stderr=devnull)
     if exit_code == 0:
       # RandR is supported
@@ skipping 22 matching lines @@
     self.x_proc = subprocess.Popen(
         ["Xorg", ":%d" % display,
          "-auth", x_auth_file,
          "-nolisten", "tcp",
          "-noreset",
          # Disable logging to a file and instead bump up the stderr verbosity
          # so the equivalent information gets logged in our main log file.
          "-logfile", "/dev/null",
          "-verbose", "3",
          "-config", config_file.name
-        ] + extra_x_args, env=self.child_env)
+        ] + extra_x_args, env=self._x_env())
     if not self.x_proc.pid:
       raise Exception("Could not start Xorg.")
     self._wait_for_x()
 
   def _launch_x_server(self, extra_x_args):
     x_auth_file = os.path.expanduser("~/.Xauthority")
     self.child_env["XAUTHORITY"] = x_auth_file
     display = self.get_unused_display_number()
 
     # Run "xauth add" with |child_env| so that it modifies the same XAUTHORITY
@@ skipping 986 matching lines @@
         else:
           logging.info("Host exited with status %s." % os.WEXITSTATUS(status))
       elif os.WIFSIGNALED(status):
         logging.info("Host terminated by signal %s." % os.WTERMSIG(status))
 
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG,
                       format="%(asctime)s:%(levelname)s:%(message)s")
   sys.exit(main())