Disk cache: Fix handling of invalid entries that are detected...

net/disk_cache/storage_block-inl.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DISK_CACHE_STORAGE_BLOCK_INL_H_
 #define NET_DISK_CACHE_STORAGE_BLOCK_INL_H_
 
 #include "net/disk_cache/storage_block.h"
 
 #include "base/logging.h"
@@ skipping 44 matching lines @@
   DCHECK(sizeof(*data_) == address.BlockSize());
   return true;
 }
 
 template<typename T> void StorageBlock<T>::SetData(T* other) {
   DCHECK(!modified_);
   DeleteData();
   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;
 }
 
 template<typename T> T* StorageBlock<T>::Data() {
   if (!data_)
     AllocateData();
   return data_;
 }
@@ skipping 15 matching lines @@
       modified_ = false;
       return true;
     }
   }
   LOG(WARNING) << "Failed data load.";
   Trace("Failed data load.");
   return false;
 }
 
 template<typename T> bool StorageBlock<T>::Store() {
-  if (file_) {
+  if (file_ && data_) {
     if (file_->Store(this)) {
       modified_ = false;
       return true;
     }
   }
   LOG(ERROR) << "Failed data store.";
   Trace("Failed data store.");
   return false;
 }
 
@@ skipping 16 matching lines @@
       data_->~T();
       delete[] reinterpret_cast<char*>(data_);
     }
     own_data_ = false;
   }
 }
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_STORAGE_BLOCK_INL_H_