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

Move IsExternal check to FromV8ValueImpl

Browse source
This commit is contained in:
Kevin Sawicki 2016-08-30 08:51:22 -07:00
parent 679ee95e8a
commit 8a9776b227
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -262,6 +262,9 @@ base::Value* V8ValueConverter::FromV8ValueImpl(
if (state->HasReachedMaxRecursionDepth()) if (state->HasReachedMaxRecursionDepth())
return nullptr; return nullptr;
if (val->IsExternal())
return base::Value::CreateNullValue().release();
if (val->IsNull()) if (val->IsNull())
return base::Value::CreateNullValue().release(); return base::Value::CreateNullValue().release();
@ -415,11 +418,6 @@ 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())