From b63c85110dae2b1a71d77e467d7956e2d3d136b7 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 15 Mar 2017 17:07:01 -0400 Subject: [PATCH] Fix CHECK failure in CefBrowserHostImpl::DidFinishNavigation (issue #2125) --- libcef/browser/browser_host_impl.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libcef/browser/browser_host_impl.cc b/libcef/browser/browser_host_impl.cc index 42f19cfb0..a6b6e4335 100644 --- a/libcef/browser/browser_host_impl.cc +++ b/libcef/browser/browser_host_impl.cc @@ -2503,7 +2503,12 @@ void CefBrowserHostImpl::RenderProcessGone(base::TerminationStatus status) { void CefBrowserHostImpl::DidFinishNavigation( content::NavigationHandle* navigation_handle) { - CHECK(navigation_handle->GetRenderFrameHost()); + // This method may be called with a nullptr RenderFrameHost (RFH) when a + // provisional load is started. It should be called again with a non-nullptr + // RFH once the provisional load is committed or if the provisional load + // fails. + if (!navigation_handle->GetRenderFrameHost()) + return; const net::Error error_code = navigation_handle->GetNetErrorCode(); if (error_code == net::OK) {