Disk cache: Fix handling of invalid entries that are detected

when doing evictions or enumerations.

This cl fixes an issue with dirty entries being deleted
twice from disk, and improves the whole thing so that
different flavors or corrupt entries are removed
gracefully. We started deleting things twice when we
created the map of currently-open entries, because
we don't want to have dirty entries on that map, so it is
possible to have multiple EntryImpl objects that refer
to the same entry (for corrupt entries).

BUG=17474
TEST=Unittests, stress_cache.exe

Review URL: http://codereview.chromium.org/155951

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21360 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 1 deletions

diff --git a/net/disk_cache/storage_block-inl.h b/net/disk_cache/storage_block-inl.h
index 9ec9fa0..909b717 100644
--- a/net/disk_cache/storage_block-inl.h
+++ b/net/disk_cache/storage_block-inl.h
@@ -62,6 +62,20 @@ template<typename T> void StorageBlock<T>::SetData(T* other) {
   data_ = other;
 }
 
+template<typename T> void  StorageBlock<T>::Discard() {
+  if (!data_)
+    return;
+  if (!own_data_) {
+    NOTREACHED();
+    return;
+  }
+  DeleteData();
+  data_ = NULL;
+  modified_ = false;
+  own_data_ = false;
+  extended_ = false;
+}
+
 template<typename T> void StorageBlock<T>::set_modified() {
   DCHECK(data_);
   modified_ = true;
@@ -97,7 +111,7 @@ template<typename T> bool StorageBlock<T>::Load() {
 }
 
 template<typename T> bool StorageBlock<T>::Store() {
-  if (file_) {
+  if (file_ && data_) {
     if (file_->Store(this)) {
       modified_ = false;
       return true;