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

Merge pull request #11099 from electron/fix-emit-call-crash

Browse source 
Fix crash when emitting unhandled error on native EventEmitter
This commit is contained in:
Charles Kerr 2017-11-16 15:57:07 -06:00 committed by GitHub
commit 9f922e9932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/common/api/event_emitter_caller.cc
View file

@ -20,8 +20,18 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
v8::MicrotasksScope::kRunMicrotasks); v8::MicrotasksScope::kRunMicrotasks);
// Use node::MakeCallback to call the callback, and it will also run pending // Use node::MakeCallback to call the callback, and it will also run pending
// tasks in Node.js. // tasks in Node.js.
return node::MakeCallback(isolate, obj, method, args->size(), &args->front(), v8::MaybeLocal<v8::Value> ret = node::MakeCallback(isolate, obj, method,
{0, 0}).ToLocalChecked(); args->size(),
&args->front(), {0, 0});
// If the JS function throws an exception (doesn't return a value) the result
// of MakeCallback will be empty and therefore ToLocal will be false, in this
// case we need to return "false" as that indicates that the event emitter did
// not handle the event
v8::Local<v8::Value> localRet;
if (ret.ToLocal(&localRet)) {
return localRet;
}
return v8::Boolean::New(isolate, false);
} }
} // namespace internal } // namespace internal