From e819b55cf062822a23280b4da7760abfd2a86e64 Mon Sep 17 00:00:00 2001 From: "rvargas@google.com" Date: Tue, 11 Aug 2009 21:59:03 +0000 Subject: Disk Cache: cleanup of OpenBlockFile. Don't add the file to the list of open files until it passes all sanity checks. BUG=18174 TEST=unittest Review URL: http://codereview.chromium.org/164336 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23090 0039d316-1c4b-4281-b951-d872f2087c98 --- net/disk_cache/block_files.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'net/disk_cache/block_files.cc') diff --git a/net/disk_cache/block_files.cc b/net/disk_cache/block_files.cc index 0e9eb04..ffb74db 100644 --- a/net/disk_cache/block_files.cc +++ b/net/disk_cache/block_files.cc @@ -237,24 +237,18 @@ bool BlockFiles::OpenBlockFile(int index) { } std::wstring name = Name(index); - MappedFile* file = new MappedFile(); - file->AddRef(); + scoped_refptr file(new MappedFile()); if (!file->Init(name, kBlockHeaderSize)) { - NOTREACHED(); LOG(ERROR) << "Failed to open " << name; - file->Release(); return false; } if (file->GetLength() < static_cast(kBlockHeaderSize)) { LOG(ERROR) << "File too small " << name; - file->Release(); return false; } - block_files_[index] = file; - BlockFileHeader* header = reinterpret_cast(file->buffer()); if (kBlockMagic != header->magic || kCurrentVersion != header->version) { LOG(ERROR) << "Invalid file version or magic"; @@ -266,6 +260,9 @@ bool BlockFiles::OpenBlockFile(int index) { if (!FixBlockFileHeader(file)) return false; } + + DCHECK(!block_files_[index]); + file.swap(&block_files_[index]); return true; } -- cgit v1.1