github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 07:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 3428874907 a3dd6c635f
commit 6bd1a2dec6
1 changed files with 5 additions and 0 deletions
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(
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);
if (env)
mate::EmitEvent(env->isolate(), env->process_object(), "exit");