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

Merge pull request #15 from mgc/muon-crash-workarounds

Browse source 
Upstream Muon changes to avoid crashing
This commit is contained in:
Cheng Zhao 2017-10-26 18:46:25 +09:00 • committed by GitHub
commit bf92fa88b7
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
native_mate/function_template.h
View file

@ -21,6 +21,9 @@ namespace internal {
struct Destroyable { struct Destroyable {
static void Destroy(Arguments* args) { static void Destroy(Arguments* args) {
if (IsDestroyed(args))
return;
v8::Local<v8::Object> holder = args->GetHolder(); v8::Local<v8::Object> holder = args->GetHolder();
delete static_cast<WrappableBase*>( delete static_cast<WrappableBase*>(
holder->GetAlignedPointerFromInternalField(0)); holder->GetAlignedPointerFromInternalField(0));

7
native_mate/wrappable.cc
View file

@ -24,8 +24,11 @@ WrappableBase::~WrappableBase() {
} }
v8::Local<v8::Object> WrappableBase::GetWrapper() { v8::Local<v8::Object> WrappableBase::GetWrapper() {
CHECK(!wrapper_.IsEmpty()); DCHECK(!wrapper_.IsEmpty());
return v8::Local<v8::Object>::New(isolate_, wrapper_); if (!wrapper_.IsEmpty())
return v8::Local<v8::Object>::New(isolate_, wrapper_);
else
return v8::Local<v8::Object>();
} }
void WrappableBase::InitWith(v8::Isolate* isolate, void WrappableBase::InitWith(v8::Isolate* isolate,