bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash due to NULL frame during navigation (fixes issue #2772)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-01-16 11:18:28 +01:00
parent c90b65a72c
commit 679850a267
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/browser_host_impl.cc
View File

@@ -2621,8 +2621,18 @@ void CefBrowserHostImpl::DidFinishNavigation(
const GURL& url = const GURL& url =
(error_code == net::OK ? navigation_handle->GetURL() : GURL()); (error_code == net::OK ? navigation_handle->GetURL() : GURL());
// May return NULL when starting a new navigation if the previous navigation
// caused the renderer process to crash during load.
CefRefPtr<CefFrameHostImpl> frame = browser_info_->GetFrameForFrameTreeNode( CefRefPtr<CefFrameHostImpl> frame = browser_info_->GetFrameForFrameTreeNode(
navigation_handle->GetFrameTreeNodeId()); navigation_handle->GetFrameTreeNodeId());
if (!frame) {
if (is_main_frame) {
frame = browser_info_->GetMainFrame();
} else {
frame =
browser_info_->CreateTempSubFrame(CefFrameHostImpl::kInvalidFrameId);
}
}
frame->RefreshAttributes(); frame->RefreshAttributes();
if (error_code == net::OK) { if (error_code == net::OK) {