Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1750)

Unified Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 1087903003: Fix browser crash on shutdown when ProfileImplIOData::Handle::Init isn't called. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index ae9af7527cec077532776e4ab4602d7b27df6529..b796df3dcbf7d2c226c3bcce8c3f051605dd81e6 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -132,7 +132,11 @@ ProfileImplIOData::Handle::~Handle() {
if (io_data_->http_server_properties_manager_)
io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
- io_data_->data_reduction_proxy_io_data()->ShutdownOnUIThread();
+ // io_data_->data_reduction_proxy_io_data() might be NULL if Init() was
+ // never called.
+ if (io_data_->data_reduction_proxy_io_data())
+ io_data_->data_reduction_proxy_io_data()->ShutdownOnUIThread();
+
io_data_->ShutdownOnUIThread(GetAllContextGetters().Pass());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698