wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 31662149dab4 (bug 1167083) for T(x) failures on a CLOSED TREE

Browse Source
This commit is contained in:
Bob Owen 2015-05-22 12:51:18 +01:00
parent 233ca347d8
commit 9e9ae00060
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
toolkit/xre/nsAppRunner.cpp
View File

@ -676,10 +676,26 @@ SetUpSandboxEnvironment()
}
}
#if defined(NIGHTLY_BUILD)
static void
CleanUpOldSandboxEnvironment()
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)
// Temporary code to clean up the old low integrity temp directories.
// The removal of this is tracked by bug 1165818.
nsCOMPtr<nsIFile> lowIntegrityMozilla;
@ -718,31 +734,7 @@ CleanUpOldSandboxEnvironment()
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