commit 752e34d739489c7f89d0802b2a42e004d6886a18
author Mark Salyzyn <salyzyn@google.com> Wed Nov 14 16:12:04 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 14 16:12:04 2018 -0800
tree e50d40312a2b9471ddd81602d629cc71b5f05ee0
parent f50b0475a5fe065d5be52eb20bcaae309270db15
parent 9c0519a34f64b812b909eb874a83d472ceb4ac4a

Merge "base: Add sensitivity to TMPDIR environment for TemporaryDir and TemporaryFile" am: 01acb70e80 am: eb96a0a06b
am: 21b89da3ad

Change-Id: Iaa34b7a7df7be35e1765bc99ee6c4489cfbb22b4

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index e4407d0..f362f94 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -72,7 +72,8 @@
 
 std::string GetSystemTempDir() {
 #if defined(__ANDROID__)
-  const char* tmpdir = "/data/local/tmp";
+  const auto* tmpdir = getenv("TMPDIR");
+  if (tmpdir == nullptr) tmpdir = "/data/local/tmp";
   if (access(tmpdir, R_OK | W_OK | X_OK) == 0) {
     return tmpdir;
   }
@@ -81,7 +82,7 @@
   return ".";
 #elif defined(_WIN32)
   char tmp_dir[MAX_PATH];
-  DWORD result = GetTempPathA(sizeof(tmp_dir), tmp_dir);
+  DWORD result = GetTempPathA(sizeof(tmp_dir), tmp_dir);  // checks TMP env
   CHECK_NE(result, 0ul) << "GetTempPathA failed, error: " << GetLastError();
   CHECK_LT(result, sizeof(tmp_dir)) << "path truncated to: " << result;
 
@@ -91,7 +92,9 @@
   tmp_dir[result - 1] = '\0';
   return tmp_dir;
 #else
-  return "/tmp";
+  const auto* tmpdir = getenv("TMPDIR");
+  if (tmpdir == nullptr) tmpdir = "/tmp";
+  return tmpdir;
 #endif
 }