diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-21 18:42:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:52 +0100 |
| commit | 59ac2493f7b3e78aba90d4278169ff962f3a6541 (patch) | |
| tree | 5106f2987a0c646a8930d3db88aa6396385ac5ef | |
| parent | 044002a37b0e3528a2b10c4f49abc3b2e3b80890 (diff) | |
| download | qtwebengine-chromium-59ac2493f7b3e78aba90d4278169ff962f3a6541.tar.gz | |
Fix crash on exit
Task-number: QTBUG-71219
Change-Id: I0c5853a110e704016e3bd41c7f54f9a5e57094ae
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/content/browser/renderer_host/render_process_host_impl.cc | 3 | ||||
| -rw-r--r-- | chromium/content/browser/ssl/ssl_manager.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc index b69c9bdfe45..dff6349da2e 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -3547,7 +3547,8 @@ void RenderProcessHostImpl::Cleanup() { ServiceManagerConnection* service_manager_connection = BrowserContext::GetServiceManagerConnectionFor(browser_context_); connection_filter_controller_->DisableFilter(); - service_manager_connection->RemoveConnectionFilter(connection_filter_id_); + if (service_manager_connection) + service_manager_connection->RemoveConnectionFilter(connection_filter_id_); connection_filter_id_ = ServiceManagerConnection::kInvalidConnectionFilterId; } diff --git a/chromium/content/browser/ssl/ssl_manager.cc b/chromium/content/browser/ssl/ssl_manager.cc index b669d0d339e..babf6ff0d57 100644 --- a/chromium/content/browser/ssl/ssl_manager.cc +++ b/chromium/content/browser/ssl/ssl_manager.cc @@ -211,7 +211,8 @@ SSLManager::SSLManager(NavigationControllerImpl* controller) SSLManager::~SSLManager() { SSLManagerSet* managers = static_cast<SSLManagerSet*>( controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName)); - managers->get().erase(this); + if (managers) + managers->get().erase(this); } void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { |