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

Ignore external values when serializing

Browse source
This commit is contained in:
Kevin Sawicki 2016-08-29 10:13:13 -07:00
parent b17a2874f8
commit 58fc1b7933
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
atom/common/native_mate_converters/v8_value_converter.cc
View file

@ -393,19 +393,6 @@ base::Value* V8ValueConverter::FromV8Object(
std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue()); std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
v8::Local<v8::Array> property_names(val->GetOwnPropertyNames()); v8::Local<v8::Array> property_names(val->GetOwnPropertyNames());
// Don't consider DOM objects. This check matches isHostObject() in Blink's
// bindings/v8/V8Binding.h used in structured cloning. It reads:
//
// If the object has any internal fields, then we won't be able to serialize
// or deserialize them; conveniently, this is also a quick way to detect DOM
// wrapper objects, because the mechanism for these relies on data stored in
// these fields.
//
// ANOTHER NOTE: returning an empty dictionary here to minimise surprise.
// See also http://crbug.com/330559.
if (val->InternalFieldCount())
return result.release();
for (uint32_t i = 0; i < property_names->Length(); ++i) { for (uint32_t i = 0; i < property_names->Length(); ++i) {
v8::Local<v8::Value> key(property_names->Get(i)); v8::Local<v8::Value> key(property_names->Get(i));
@ -428,6 +415,11 @@ base::Value* V8ValueConverter::FromV8Object(
child_v8 = v8::Null(isolate); child_v8 = v8::Null(isolate);
} }
// Ignore external values since calling CreationContext() on them can
// crash
if (child_v8->IsExternal())
continue;
std::unique_ptr<base::Value> child( std::unique_ptr<base::Value> child(
FromV8ValueImpl(state, child_v8, isolate)); FromV8ValueImpl(state, child_v8, isolate));
if (!child.get()) if (!child.get())