github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
parent f047bb61bb 6ea2755095
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 {
static void Destroy(Arguments* args) {
if (IsDestroyed(args))
return;
v8::Local<v8::Object> holder = args->GetHolder();
delete static_cast<WrappableBase*>(
holder->GetAlignedPointerFromInternalField(0));

7
native_mate/wrappable.cc
View File

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