lib/file: Paranoid clear of old cached values

Rare, but an app might toggle addPid; cover this.  Also optimize the
cache update.

diff --git a/open-vm-tools/lib/file/fileTempPosix.c b/open-vm-tools/lib/file/fileTempPosix.c
index 22c627bd3fac4c91fd978977ae556d471814567f..a3cca3178c271b8c657379833fb6ef23260e9e4d 100644 (file)
--- a/open-vm-tools/lib/file/fileTempPosix.c
+++ b/open-vm-tools/lib/file/fileTempPosix.c
@@ -566,22 +566,30 @@ FileGetSafeTmpDir(Bool useConf,  // IN: Use configuration variables?
    }
 
    if (tmpDir != NULL) {
-      /*
-       * We have successfully created a temporary directory, remember it for
-       * future calls.
-       */
-
-      testSafeDir = Util_SafeStrdup(tmpDir);
-
-      if (addPid) {
-         Posix_Free(cachedPidDir);
-         cachedPidDir = testSafeDir;
+      char *newDir = Util_SafeStrdup(tmpDir);
+
+      if (euid == cachedEuid) {
+         if (addPid) {
+            Posix_Free(cachedPidDir);
+            cachedPidDir = newDir;
+         } else {
+            Posix_Free(cachedDir);
+            cachedDir = newDir;
+         }
       } else {
+         Posix_Free(cachedPidDir);
          Posix_Free(cachedDir);
-         cachedDir = testSafeDir;
-      }
 
-      cachedEuid = euid;
+         if (addPid) {
+            cachedPidDir = newDir;
+            cachedDir = NULL;
+         } else {
+            cachedDir = newDir;
+            cachedPidDir = NULL;
+         }
+
+         cachedEuid = euid;
+      }
    }
 
 exit: