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

fix: make child windows not crash when ipc messages are received (#19553)

Browse source
This commit is contained in:
Samuel Attard 2019-08-05 12:50:51 -07:00 • committed by Jeremy Apthorp
commit 33a9d898a6
6 changed files with 39 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/renderer/electron_api_service_impl.cc
View file

@ -39,7 +39,10 @@ v8::Local<v8::Object> GetIpcObject(v8::Local<v8::Context> context) {
auto global_object = context->Global();
auto value =
global_object->GetPrivate(context, private_binding_key).ToLocalChecked();
DCHECK(!value.IsEmpty() && value->IsObject());
if (value.IsEmpty() || !value->IsObject()) {
LOG(ERROR) << "Attempted to get the 'ipcNative' object but it was missing";
return v8::Local<v8::Object>();
}
return value->ToObject(context).ToLocalChecked();
}
@ -50,6 +53,8 @@ void InvokeIpcCallback(v8::Local<v8::Context> context,
auto* isolate = context->GetIsolate();
auto ipcNative = GetIpcObject(context);
if (ipcNative.IsEmpty())
return;
// Only set up the node::CallbackScope if there's a node environment.
// Sandboxed renderers don't have a node environment.