github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-01 02:35:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3198 from deepak1556/callback_patch

Browse Source 
nativemate: use maybe version of v8::Function::call to avoid unhandled exceptions
This commit is contained in:
Cheng Zhao
2015-10-26 16:15:58 +08:00
parent 8976708e67 70fe169b0f
commit c973357752
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
atom/common/native_mate_converters/callback.h
View File

@@ -70,10 +70,13 @@ struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
v8::Local<v8::Function> holder = function->NewHandle();
v8::Local<v8::Context> context = holder->CreationContext();
v8::Context::Scope context_scope(context);
ReturnType ret;
ReturnType ret = ReturnType();
std::vector<v8::Local<v8::Value>> args = { ConvertToV8(isolate, raw)... };
v8::Local<v8::Value> val(holder->Call(holder, args.size(), &args.front()));
Converter<ReturnType>::FromV8(isolate, val, &ret);
v8::Local<v8::Value> result;
auto maybe_result =
holder->Call(context, holder, args.size(), &args.front());
if (maybe_result.ToLocal(&result))
Converter<ReturnType>::FromV8(isolate, result, &ret);
return ret;
}
};