diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-05 12:14:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-05 12:14:36 -0700 |
| commit | db1b8993439cc1b0f741735e15d72a8cd67a6752 (patch) | |
| tree | 396a4bc17c30655c78fd62fe34778900c40a97cc | |
| parent | de6c9f9aec5e2e7e66cb77140f7418fc29644ef0 (diff) | |
| parent | 5dfd28055043f52c8089d2b26e101de1f66838c8 (diff) | |
| download | external_chromium-db1b8993439cc1b0f741735e15d72a8cd67a6752.zip external_chromium-db1b8993439cc1b0f741735e15d72a8cd67a6752.tar.gz external_chromium-db1b8993439cc1b0f741735e15d72a8cd67a6752.tar.bz2 | |
am 5dfd2805: Merge "Null pointer check missing in chromium"
* commit '5dfd28055043f52c8089d2b26e101de1f66838c8':
Null pointer check missing in chromium
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 8 |
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(); |