From 7263d45bbf0b0d6687c240ceffb14ea5bfb1d83a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 16 Aug 2013 17:06:45 +0000 Subject: [PATCH] Merge revision 1369 changes: - Fix render process crash when detaching a frame that never navigated. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1371 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef3/libcef/renderer/browser_impl.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cef3/libcef/renderer/browser_impl.cc b/cef3/libcef/renderer/browser_impl.cc index ba03dea2e..a348e2970 100644 --- a/cef3/libcef/renderer/browser_impl.cc +++ b/cef3/libcef/renderer/browser_impl.cc @@ -470,12 +470,13 @@ void CefBrowserImpl::DidStartProvisionalLoad(WebKit::WebFrame* frame) { void CefBrowserImpl::FrameDetached(WebFrame* frame) { int64 frame_id = frame->identifier(); - { + if (!frames_.empty()) { // Remove the frame from the map. FrameMap::iterator it = frames_.find(frame_id); - DCHECK(it != frames_.end()); - it->second->Detach(); - frames_.erase(it); + if (it != frames_.end()) { + it->second->Detach(); + frames_.erase(it); + } } if (!frame_objects_.empty()) {