corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 971975 - Proper state and non-null check for CacheFile::WriteMetadataIfNeededLocked(), r=michal

Browse Source
This commit is contained in:
Honza Bambas
2014-02-14 14:21:28 +01:00
parent dc1f3e306d
commit fa7a3d5457
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netwerk/cache2/CacheFile.cpp
View File

@@ -177,9 +177,11 @@ CacheFile::~CacheFile()
LOG(("CacheFile::~CacheFile() [this=%p]", this)); LOG(("CacheFile::~CacheFile() [this=%p]", this));
MutexAutoLock lock(mLock); MutexAutoLock lock(mLock);
if (!mMemoryOnly) if (!mMemoryOnly && mReady) {
// mReady flag indicates we have metadata plus in a valid state.
WriteMetadataIfNeededLocked(true); WriteMetadataIfNeededLocked(true);
} }
}
nsresult nsresult
CacheFile::Init(const nsACString &aKey, CacheFile::Init(const nsACString &aKey,
@@ -1335,6 +1337,11 @@ CacheFile::WriteMetadataIfNeededLocked(bool aFireAndForget)
AssertOwnsLock(); AssertOwnsLock();
MOZ_ASSERT(!mMemoryOnly); MOZ_ASSERT(!mMemoryOnly);
if (!mMetadata) {
MOZ_CRASH("Must have metadata here");
return;
}
if (!aFireAndForget) { if (!aFireAndForget) {
// if aFireAndForget is set, we are called from dtor. Write // if aFireAndForget is set, we are called from dtor. Write
// scheduler hard-refers CacheFile otherwise, so we cannot be here. // scheduler hard-refers CacheFile otherwise, so we cannot be here.