summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-05 11:41:18 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-05 11:41:18 -0700
commit5dfd28055043f52c8089d2b26e101de1f66838c8 (patch)
treebdb2eef591889d3387014a656b346a188486eb86
parentf4aee7bd601621d648044a0f918247fd81b6190a (diff)
parenta7f1721675b8b6e0389732f1e25788012f7c20b7 (diff)
downloadexternal_chromium-5dfd28055043f52c8089d2b26e101de1f66838c8.zip
external_chromium-5dfd28055043f52c8089d2b26e101de1f66838c8.tar.gz
external_chromium-5dfd28055043f52c8089d2b26e101de1f66838c8.tar.bz2
Merge "Null pointer check missing in chromium"
-rw-r--r--net/disk_cache/backend_impl.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 117f20b..81c44d5 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -1484,7 +1484,13 @@ void BackendImpl::PrepareForRestart() {
new_eviction_ = false;
disabled_ = true;
- data_->header.crash = 0;
+#ifdef ANDROID
+ if (data_) {
+#endif
+ data_->header.crash = 0;
+#ifdef ANDROID
+ }
+#endif
index_ = NULL;
data_ = NULL;
block_files_.CloseFiles();