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

fix: use OS process handle to clear object registry (#14324)

Browse source 
RenderProcessHost switch can happen between ipc calls when
speculative process are invvolved, which will lead to deletion
of entries on current context. Use OS process handles to
uniquely associate a destruction handler for a render process.
This commit is contained in:
Robo 2018-08-29 00:02:46 +05:30 • committed by Charles Kerr
parent 98b7a9ce9c
commit edd5c4b9bb
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/renderer_client_base.cc
View file

@ -16,7 +16,7 @@
#include "atom/renderer/content_settings_observer.h"
#include "atom/renderer/preferences_manager.h"
#include "base/command_line.h"
#include "base/process/process_handle.h"
#include "base/process/process.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "chrome/renderer/media/chrome_key_systems.h"
@ -97,7 +97,8 @@ void RendererClientBase::DidCreateScriptContext(
content::RenderFrame* render_frame) {
// global.setHidden("contextId", `${processId}-${++next_context_id_}`)
std::string context_id = base::StringPrintf(
"%" CrPRIdPid "-%d", base::GetCurrentProcId(), ++next_context_id_);
"%" CrPRIdPid "-%d", base::GetProcId(base::Process::Current().Handle()),
++next_context_id_);
v8::Isolate* isolate = context->GetIsolate();
v8::Local<v8::String> key = mate::StringToSymbol(isolate, "contextId");
v8::Local<v8::Private> private_key = v8::Private::ForApi(isolate, key);