Skip to content

inspector: forward errors from InspectorConsoleCall #26113

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
addaleax wants to merge 1 commit into from
Closed

inspector: forward errors from InspectorConsoleCall #26113

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
inspector: forward errors from InspectorConsoleCall 
Do not assume that entering JS cannot fail.
  • Loading branch information
@addaleax
addaleax committed Feb 14, 2019
commit 777d809773cb16791007cdb82fc298f07d42f642
24 changes: 15 additions & 9 deletions src/inspector_js_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,22 @@ void InspectorConsoleCall(const FunctionCallbackInfo<Value>& info) {
CHECK(config_value->IsObject());
Local<Object> config_object = config_value.As<Object>();
Local<String> in_call_key = FIXED_ONE_BYTE_STRING(isolate, "in_call");
if (!config_object->Has(context, in_call_key).FromMaybe(false)) {
CHECK(config_object->Set(context,
in_call_key,
v8::True(isolate)).FromJust());
CHECK(!inspector_method.As<Function>()->Call(context,
info.Holder(),
call_args.length(),
call_args.out()).IsEmpty());
bool has_in_call;
if (!config_object->Has(context, in_call_key).To(&has_in_call))
return;
if (!has_in_call) {
if (config_object->Set(context,
in_call_key,
v8::True(isolate)).IsNothing() ||
inspector_method.As<Function>()->Call(context,
info.Holder(),
call_args.length(),
call_args.out()).IsEmpty()) {
return;
}
}
CHECK(config_object->Delete(context, in_call_key).FromJust());
if (config_object->Delete(context, in_call_key).IsNothing())
return;
}

Local<Value> node_method = info[1];
Expand Down