Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit be671c3

Browse filesBrowse files
addaleaxrvagg
authored andcommitted
inspector: forward errors from InspectorConsoleCall
Do not assume that entering JS cannot fail. PR-URL: #26113 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 7d66d47 commit be671c3
Copy full SHA for be671c3

File tree

Expand file treeCollapse file tree

1 file changed

+15
-9
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+15
-9
lines changed
Open diff view settings
Collapse file

‎src/inspector_js_api.cc‎

Copy file name to clipboardExpand all lines: src/inspector_js_api.cc
+15-9Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,22 @@ void InspectorConsoleCall(const FunctionCallbackInfo<Value>& info) {
158158
CHECK(config_value->IsObject());
159159
Local<Object> config_object = config_value.As<Object>();
160160
Local<String> in_call_key = FIXED_ONE_BYTE_STRING(isolate, "in_call");
161-
if (!config_object->Has(context, in_call_key).FromMaybe(false)) {
162-
CHECK(config_object->Set(context,
163-
in_call_key,
164-
v8::True(isolate)).FromJust());
165-
CHECK(!inspector_method.As<Function>()->Call(context,
166-
info.Holder(),
167-
call_args.length(),
168-
call_args.out()).IsEmpty());
161+
bool has_in_call;
162+
if (!config_object->Has(context, in_call_key).To(&has_in_call))
163+
return;
164+
if (!has_in_call) {
165+
if (config_object->Set(context,
166+
in_call_key,
167+
v8::True(isolate)).IsNothing() ||
168+
inspector_method.As<Function>()->Call(context,
169+
info.Holder(),
170+
call_args.length(),
171+
call_args.out()).IsEmpty()) {
172+
return;
173+
}
169174
}
170-
CHECK(config_object->Delete(context, in_call_key).FromJust());
175+
if (config_object->Delete(context, in_call_key).IsNothing())
176+
return;
171177
}
172178

173179
Local<Value> node_method = info[1];

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.