summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/entry_impl.cc
diff options
context:
space:
mode:
authorrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 01:19:19 +0000
committerrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 01:19:19 +0000
commit52c7571772423908a3c672a55885c1595a45c4ae (patch)
treebcd08b180bf163379d67be9b7fcf06d6bacfda96 /net/disk_cache/entry_impl.cc
parente04b0dc9ab239409cd01856be93553308bd6bb26 (diff)
downloadchromium_src-52c7571772423908a3c672a55885c1595a45c4ae.zip
chromium_src-52c7571772423908a3c672a55885c1595a45c4ae.tar.gz
chromium_src-52c7571772423908a3c672a55885c1595a45c4ae.tar.bz2
Disk Cache: Discard entries from ReadData if something is clearly wrong.
BUG=107457 TEST=net_unittests Review URL: http://codereview.chromium.org/8913013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/entry_impl.cc')
-rw-r--r--net/disk_cache/entry_impl.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc
index 7e13029..b0226a7 100644
--- a/net/disk_cache/entry_impl.cc
+++ b/net/disk_cache/entry_impl.cc
@@ -974,12 +974,16 @@ int EntryImpl::InternalReadData(int index, int offset, net::IOBuffer* buf,
address.set_value(entry_.Data()->data_addr[index]);
DCHECK(address.is_initialized());
- if (!address.is_initialized())
+ if (!address.is_initialized()) {
+ DoomImpl();
return net::ERR_FAILED;
+ }
File* file = GetBackingFile(address, index);
- if (!file)
+ if (!file) {
+ DoomImpl();
return net::ERR_FAILED;
+ }
size_t file_offset = offset;
if (address.is_block_file()) {
@@ -1000,6 +1004,7 @@ int EntryImpl::InternalReadData(int index, int offset, net::IOBuffer* buf,
if (!file->Read(buf->data(), buf_len, file_offset, io_callback, &completed)) {
if (io_callback)
io_callback->Discard();
+ DoomImpl();
return net::ERR_FAILED;
}