mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix nullref crash in RemoveGuest

Browse source
This commit is contained in:
Paul Betts 2014-12-15 06:10:39 -08:00
parent 85b0885af7
commit 3105092130
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/web_view/web_view_manager.cc
View file

@ -81,12 +81,16 @@ void WebViewManager::AddGuest(int guest_instance_id,
void WebViewManager::RemoveGuest(int guest_instance_id) { void WebViewManager::RemoveGuest(int guest_instance_id) {
auto web_contents = web_contents_map_[guest_instance_id].web_contents; auto web_contents = web_contents_map_[guest_instance_id].web_contents;
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE, if (web_contents) {
base::Bind( content::BrowserThread::PostTask(
&WebViewRendererState::RemoveGuest, content::BrowserThread::IO, FROM_HERE,
base::Unretained(WebViewRendererState::GetInstance()), base::Bind(
web_contents->GetRenderProcessHost()->GetID())); &WebViewRendererState::RemoveGuest,
base::Unretained(WebViewRendererState::GetInstance()),
web_contents->GetRenderProcessHost()->GetID()));
}
web_contents_map_.erase(guest_instance_id); web_contents_map_.erase(guest_instance_id);
// Remove the record of element in embedder too. // Remove the record of element in embedder too.