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

Merge pull request #6144 from electron/crash-release-renderer

Browse source 
Avoid calling Environment::GetCurrent for unjected contexts
This commit is contained in:
Cheng Zhao 2016-06-20 08:09:42 +00:00 committed by GitHub
commit 6bd1a2dec6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/atom_renderer_client.cc
View file

@ -282,6 +282,11 @@ void AtomRendererClient::DidCreateScriptContext(
void AtomRendererClient::WillReleaseScriptContext( void AtomRendererClient::WillReleaseScriptContext(
v8::Handle<v8::Context> context, content::RenderFrame* render_frame) { v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
// Only allow node integration for the main frame, unless it is a devtools
// extension page.
if (!render_frame->IsMainFrame() && !IsDevToolsExtension(render_frame))
return;
node::Environment* env = node::Environment::GetCurrent(context); node::Environment* env = node::Environment::GetCurrent(context);
if (env) if (env)
mate::EmitEvent(env->isolate(), env->process_object(), "exit"); mate::EmitEvent(env->isolate(), env->process_object(), "exit");