Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1443651: Don't return failure for access denied from createUnique() if file exists. r=Mossop

Browse Source 
There are ways for Create() to return access denied for files which already
exist, particularly in the case of locked files. When it does, createUnique()
should check whether the file exists before considering the attempt a failure.

MozReview-Commit-ID: FyJTghk04jH

--HG--
extra : rebase_source : 10e6f2cb7da18e8e6d410b52a593b7455f0d76fa
This commit is contained in:
Kris Maglione 2018-03-06 14:32:40 -08:00
parent 2faddce683
commit afc3918d22
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/io/nsLocalFileCommon.cpp
View File

@ -61,11 +61,19 @@ nsLocalFile::CreateUnique(uint32_t aType, uint32_t aAttributes)
return rv;
}
auto FailedBecauseExists = [&] (nsresult aRv) {
if (aRv == NS_ERROR_FILE_ACCESS_DENIED) {
bool exists;
return NS_SUCCEEDED(Exists(&exists)) && exists;
}
return aRv == NS_ERROR_FILE_ALREADY_EXISTS;
};
longName = (pathName.Length() + kMaxSequenceNumberLength >
kMaxFilenameLength);
if (!longName) {
rv = Create(aType, aAttributes);
if (rv != NS_ERROR_FILE_ALREADY_EXISTS) {
if (!FailedBecauseExists(rv)) {
return rv;
}
}
@ -128,7 +136,7 @@ nsLocalFile::CreateUnique(uint32_t aType, uint32_t aAttributes)
SetNativeLeafName(rootName + suffix);
#endif
nsresult rvCreate = Create(aType, aAttributes);
if (rvCreate != NS_ERROR_FILE_ALREADY_EXISTS) {
if (!FailedBecauseExists(rvCreate)) {
return rvCreate;
}
}
@ -143,7 +151,7 @@ nsLocalFile::CreateUnique(uint32_t aType, uint32_t aAttributes)
SetNativeLeafName(rootName + nsPrintfCString("-%d", indx) + suffix);
#endif
rv = Create(aType, aAttributes);
if (NS_SUCCEEDED(rv) || rv != NS_ERROR_FILE_ALREADY_EXISTS) {
if (NS_SUCCEEDED(rv) || !FailedBecauseExists(rv)) {
return rv;
}
}