From 899cdb48d7975ab38547ada1a37cd0a5dc115d8f Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 May 2016 12:46:14 +0900 Subject: [PATCH] Fix using invalid pointer as SiteInstance --- atom/browser/atom_browser_client.cc | 5 +++-- vendor/brightray | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index c2ee2096ee9e..220256646831 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -129,8 +129,9 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation( if (url.SchemeIs(url::kJavaScriptScheme)) return; - *new_instance = - content::SiteInstance::CreateForURL(browser_context, url).get(); + scoped_refptr site_instance = + content::SiteInstance::CreateForURL(browser_context, url); + *new_instance = site_instance.get(); // Remember the original renderer process of the pending renderer process. auto current_process = current_instance->GetProcess(); diff --git a/vendor/brightray b/vendor/brightray index 2f3fbc1594aa..531df4370bee 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 2f3fbc1594aae7a44498897c0d790f42b2a31e0a +Subproject commit 531df4370bee785169d1d6a03f1746895e446912