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

fix: "Failed to serialize arguments" when emitting 'context-menu' for webview (#31259)

Browse source 
* fix: sanitize params for 'context-menu' event sent over IPC for webview

* Revert "fix: sanitize params for 'context-menu' event sent over IPC for webview"

This reverts commit 7fee455138e8470756a677dcca1a830260ba8d97.

* fix: make frame property non-enumerable in params for 'context-menu' event
This commit is contained in:
Milan Burda 2021-10-04 20:00:25 +02:00 committed by GitHub
parent 3b2c46dfd6
commit d7a7c120d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/common/gin_converters/content_converter.cc
View file

@ -80,7 +80,7 @@ v8::Local<v8::Value> Converter<ContextMenuParamsWithRenderFrameHost>::ToV8(
const auto& params = val.first; const auto& params = val.first;
content::RenderFrameHost* render_frame_host = val.second; content::RenderFrameHost* render_frame_host = val.second;
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate); gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
dict.SetGetter("frame", render_frame_host); dict.SetGetter("frame", render_frame_host, v8::DontEnum);
dict.Set("x", params.x); dict.Set("x", params.x);
dict.Set("y", params.y); dict.Set("y", params.y);
dict.Set("linkURL", params.link_url); dict.Set("linkURL", params.link_url);

6
shell/common/gin_helper/dictionary.h
View file

@ -111,7 +111,9 @@ class Dictionary : public gin::Dictionary {
} }
template <typename K, typename V> template <typename K, typename V>
bool SetGetter(const K& key, const V& val) { bool SetGetter(const K& key,
const V& val,
v8::PropertyAttribute attribute = v8::None) {
AccessorValue<V> acc_value; AccessorValue<V> acc_value;
acc_value.Value = val; acc_value.Value = val;
@ -136,7 +138,7 @@ class Dictionary : public gin::Dictionary {
if (gin::TryConvertToV8(info.GetIsolate(), val, &v8_value)) if (gin::TryConvertToV8(info.GetIsolate(), val, &v8_value))
info.GetReturnValue().Set(v8_value); info.GetReturnValue().Set(v8_value);
}, },
NULL, v8_value_accessor) nullptr, v8_value_accessor, v8::DEFAULT, attribute)
.ToChecked(); .ToChecked();
} }