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

Merge pull request from GHSA-h9jc-284h-533g

Browse source
This commit is contained in:
Samuel Attard 2020-04-16 14:10:18 -07:00 • committed by GitHub
parent d0f19d8369
commit e4c82fdf2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shell/renderer/api/electron_api_context_bridge.cc
View file

@ -398,19 +398,19 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
context_bridge::ObjectCache* object_cache, context_bridge::ObjectCache* object_cache,
int recursion_depth) { int recursion_depth) {
gin_helper::Dictionary api(source_context->GetIsolate(), api_object); gin_helper::Dictionary api(source_context->GetIsolate(), api_object);
gin_helper::Dictionary proxy =
gin::Dictionary::CreateEmpty(destination_context->GetIsolate());
object_cache->CacheProxiedObject(api.GetHandle(), proxy.GetHandle());
auto maybe_keys = api.GetHandle()->GetOwnPropertyNames(
source_context,
static_cast<v8::PropertyFilter>(v8::ONLY_ENUMERABLE | v8::SKIP_SYMBOLS),
v8::KeyConversionMode::kConvertToString);
if (maybe_keys.IsEmpty())
return v8::MaybeLocal<v8::Object>(proxy.GetHandle());
auto keys = maybe_keys.ToLocalChecked();
v8::Context::Scope destination_context_scope(destination_context); v8::Context::Scope destination_context_scope(destination_context);
{ {
gin_helper::Dictionary proxy =
gin::Dictionary::CreateEmpty(destination_context->GetIsolate());
object_cache->CacheProxiedObject(api.GetHandle(), proxy.GetHandle());
auto maybe_keys = api.GetHandle()->GetOwnPropertyNames(
source_context,
static_cast<v8::PropertyFilter>(v8::ONLY_ENUMERABLE | v8::SKIP_SYMBOLS),
v8::KeyConversionMode::kConvertToString);
if (maybe_keys.IsEmpty())
return v8::MaybeLocal<v8::Object>(proxy.GetHandle());
auto keys = maybe_keys.ToLocalChecked();
uint32_t length = keys->Length(); uint32_t length = keys->Length();
std::string key_str; std::string key_str;
for (uint32_t i = 0; i < length; i++) { for (uint32_t i = 0; i < length; i++) {

2
spec-main/api-context-bridge-spec.ts
View file

@ -422,6 +422,7 @@ describe('contextBridge', () => {
string: 'string', string: 'string',
boolean: true, boolean: true,
arr: [123, 'string', true, ['foo']], arr: [123, 'string', true, ['foo']],
getObject: () => ({ thing: 123 }),
getNumber: () => 123, getNumber: () => 123,
getString: () => 'string', getString: () => 'string',
getBoolean: () => true, getBoolean: () => true,
@ -455,6 +456,7 @@ describe('contextBridge', () => {
[example.arr[3][0], String], [example.arr[3][0], String],
[example.getNumber, Function], [example.getNumber, Function],
[example.getNumber(), Number], [example.getNumber(), Number],
[example.getObject(), Object],
[example.getString(), String], [example.getString(), String],
[example.getBoolean(), Boolean], [example.getBoolean(), Boolean],
[example.getArr(), Array], [example.getArr(), Array],