Bug 1167083: Fix memory leak in Windows low integrity temp clean up code. r=billm

testing/talos/talos.json

@@ -5,7 +5,7 @@
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "a6052c33d420"
+        "talos_revision": "e04283e4f2b2"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]

toolkit/xre/nsAppRunner.cpp

@@ -676,26 +676,10 @@ SetUpSandboxEnvironment()
   }
 }
 
-static void
-CleanUpSandboxEnvironment()
-{
-  // We can't have created a low integrity temp before Vista.
-  if (!IsVistaOrLater()) {
-    return;
-  }
-
-  // Get temp directory suffix pref.
-  nsAdoptingString tempDirSuffix =
-    Preferences::GetString("security.sandbox.content.tempDirSuffix");
-  if (tempDirSuffix.IsEmpty()) {
-    return;
-  }
-
-  // Get and remove the low integrity Mozilla temp directory.
-  // This function already warns if the deletion fails.
-  unused << GetAndCleanLowIntegrityTemp(tempDirSuffix);
-
 #if defined(NIGHTLY_BUILD)
+static void
+CleanUpOldSandboxEnvironment()
+{
   // Temporary code to clean up the old low integrity temp directories.
   // The removal of this is tracked by bug 1165818.
   nsCOMPtr<nsIFile> lowIntegrityMozilla;
@@ -734,7 +718,31 @@ CleanUpSandboxEnvironment()
       file->Remove(/* aRecursive */ true);
     }
   }
+}
 #endif
+
+static void
+CleanUpSandboxEnvironment()
+{
+  // We can't have created a low integrity temp before Vista.
+  if (!IsVistaOrLater()) {
+    return;
+  }
+
+#if defined(NIGHTLY_BUILD)
+  CleanUpOldSandboxEnvironment();
+#endif
+
+  // Get temp directory suffix pref.
+  nsAdoptingString tempDirSuffix =
+    Preferences::GetString("security.sandbox.content.tempDirSuffix");
+  if (tempDirSuffix.IsEmpty()) {
+    return;
+  }
+
+  // Get and remove the low integrity Mozilla temp directory.
+  // This function already warns if the deletion fails.
+  nsCOMPtr<nsIFile> lowIntegrityTemp = GetAndCleanLowIntegrityTemp(tempDirSuffix);
 }
 #endif