Skip to content

src: improve error handling in callback.cc #57758

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

Closed
wants to merge 1 commit into from
Closed

src: improve error handling in callback.cc #57758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 28 additions & 15 deletions src/api/callback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ using v8::HandleScope;
using v8::Isolate;
using v8::Local;
using v8::MaybeLocal;
using v8::Number;
using v8::Object;
using v8::String;
using v8::Undefined;
Expand Down Expand Up @@ -51,7 +52,7 @@ InternalCallbackScope::InternalCallbackScope(Environment* env,
Local<Object> object,
const async_context& asyncContext,
int flags,
v8::Local<v8::Value> context_frame)
Local<Value> context_frame)
: env_(env),
async_context_(asyncContext),
object_(object),
Expand Down Expand Up @@ -216,7 +217,7 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
Local<Context> context = env->context();
if (use_async_hooks_trampoline) {
MaybeStackBuffer<Local<Value>, 16> args(3 + argc);
args[0] = v8::Number::New(env->isolate(), asyncContext.async_id);
args[0] = Number::New(env->isolate(), asyncContext.async_id);
args[1] = resource;
args[2] = callback;
for (int i = 0; i < argc; i++) {
Expand Down Expand Up @@ -248,8 +249,10 @@ MaybeLocal<Value> MakeCallback(Isolate* isolate,
int argc,
Local<Value> argv[],
async_context asyncContext) {
Local<String> method_string =
String::NewFromUtf8(isolate, method).ToLocalChecked();
Local<String> method_string;
if (!String::NewFromUtf8(isolate, method).ToLocal(&method_string)) {
return {};
}
return MakeCallback(isolate, recv, method_string, argc, argv, asyncContext);
}

Expand All @@ -260,13 +263,18 @@ MaybeLocal<Value> MakeCallback(Isolate* isolate,
Local<Value> argv[],
async_context asyncContext) {
// Check can_call_into_js() first because calling Get() might do so.
Environment* env = Environment::GetCurrent(recv->GetCreationContextChecked());
Local<Context> context;
if (!recv->GetCreationContext().ToLocal(&context)) {
return {};
}
Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env);
if (!env->can_call_into_js()) return Local<Value>();
if (!env->can_call_into_js()) return {};

Local<Value> callback_v;
if (!recv->Get(isolate->GetCurrentContext(), symbol).ToLocal(&callback_v))
return Local<Value>();
if (!recv->Get(isolate->GetCurrentContext(), symbol).ToLocal(&callback_v)) {
return {};
}
if (!callback_v->IsFunction()) {
// This used to return an empty value, but Undefined() makes more sense
// since no exception is pending here.
Expand Down Expand Up @@ -300,8 +308,11 @@ MaybeLocal<Value> InternalMakeCallback(Isolate* isolate,
//
// Because of the AssignToContext() call in src/node_contextify.cc,
// the two contexts need not be the same.
Environment* env =
Environment::GetCurrent(callback->GetCreationContextChecked());
Local<Context> context;
if (!callback->GetCreationContext().ToLocal(&context)) {
return {};
}
Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env);
Context::Scope context_scope(env->context());
MaybeLocal<Value> ret = InternalMakeCallback(
Expand All @@ -323,12 +334,14 @@ MaybeLocal<Value> MakeSyncCallback(Isolate* isolate,
Local<Function> callback,
int argc,
Local<Value> argv[]) {
Environment* env =
Environment::GetCurrent(callback->GetCreationContextChecked());
Local<Context> context;
if (!callback->GetCreationContext().ToLocal(&context)) {
return {};
}
Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env);
if (!env->can_call_into_js()) return Local<Value>();
if (!env->can_call_into_js()) return {};

Local<Context> context = env->context();
Context::Scope context_scope(context);
if (env->async_callback_scope_depth()) {
// There's another MakeCallback() on the stack, piggy back on it.
Expand All @@ -345,7 +358,7 @@ MaybeLocal<Value> MakeSyncCallback(Isolate* isolate,
argc,
argv,
async_context{0, 0},
v8::Undefined(isolate));
Undefined(isolate));
return ret;
}

Expand Down
Loading