Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: make MakeCallback() check can_call_into_js before getting method #35424

Closed
wants to merge 3 commits into from
Closed

src: make MakeCallback() check can_call_into_js before getting method #35424

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ea016
src: make MakeCallback() check can_call_into_js before getting method
addaleax Sep 30, 2020
fac7059
fixup! src: make MakeCallback() check can_call_into_js before getting…
addaleax Sep 30, 2020
3327dcd
fixup! src: make MakeCallback() check can_call_into_js before getting…
addaleax Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/api/callback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,19 @@ MaybeLocal<Value> MakeCallback(Isolate* isolate,
int argc,
Local<Value> argv[],
async_context asyncContext) {
Local<Value> callback_v =
recv->Get(isolate->GetCurrentContext(), symbol).ToLocalChecked();
if (callback_v.IsEmpty()) return Local<Value>();
if (!callback_v->IsFunction()) return Local<Value>();
// Check can_call_into_js() first because calling Get() might do so.
Environment* env = Environment::GetCurrent(recv->CreationContext());
CHECK_NOT_NULL(env);
if (!env->can_call_into_js()) return Local<Value>();

Local<Value> callback_v;
if (!recv->Get(isolate->GetCurrentContext(), symbol).ToLocal(&callback_v))
return Local<Value>();
if (!callback_v->IsFunction()) {
// This used to return an empty value, but Undefined() makes more sense
// since no exception is pending here.
return Undefined(isolate);
puzpuzpuz marked this conversation as resolved.
Show resolved Hide resolved
}
Local<Function> callback = callback_v.As<Function>();
return MakeCallback(isolate, recv, callback, argc, argv, asyncContext);
}
Expand Down