Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1278547: Don't attempt to delete the content process temp directory when it is the normal temp. r=jimm

Browse Source 
MozReview-Commit-ID: t0rLIuFVMj
This commit is contained in:
Bob Owen 2016-06-08 07:46:57 +01:00
parent 3078d330ba
commit 7144380893
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/xre/nsAppRunner.cpp
View File

@ -624,6 +624,22 @@ GetAndCleanTempDir()
return nullptr;
}
// If the NS_APP_CONTENT_PROCESS_TEMP_DIR is the real temp directory, don't
// attempt to delete it.
nsCOMPtr<nsIFile> realTempDir;
rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(realTempDir));
if (NS_WARN_IF(NS_FAILED(rv))) {
return nullptr;
}
bool isRealTemp;
rv = tempDir->Equals(realTempDir, &isRealTemp);
if (NS_WARN_IF(NS_FAILED(rv))) {
return nullptr;
}
if (isRealTemp) {
return tempDir.forget();
}
// Don't return an error if the directory doesn't exist.
// Windows Remove() returns NS_ERROR_FILE_NOT_FOUND while
// OS X returns NS_ERROR_FILE_TARGET_DOES_NOT_EXIST.