Skip to content

Commit a607707

Browse files
jasnelljasnell
committed
src: make even more improvements to error handling
1 parent 60dff42 commit a607707

15 files changed

+133
-69
lines changed

‎src/crypto/crypto_tls.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,10 +2157,10 @@ void TLSWrap::SetMaxSendFragment(const FunctionCallbackInfo<Value>& args) {
21572157
Environment* env = Environment::GetCurrent(args);
21582158
TLSWrap* w;
21592159
ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
2160-
int rv = SSL_set_max_send_fragment(
2161-
w->ssl_.get(),
2162-
args[0]->Int32Value(env->context()).FromJust());
2163-
args.GetReturnValue().Set(rv);
2160+
int val;
2161+
if (args[0]->Int32Value(env->context()).To(&val)) {
2162+
args.GetReturnValue().Set(SSL_set_max_send_fragment(w->ssl_.get(), val));
2163+
}
21642164
}
21652165
#endif // SSL_set_max_send_fragment
21662166

‎src/inspector_js_api.cc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,10 @@ template <void (Agent::*asyncTaskFn)(void*)>
231231
static void InvokeAsyncTaskFnWithId(const FunctionCallbackInfo<Value>& args) {
232232
Environment* env = Environment::GetCurrent(args);
233233
CHECK(args[0]->IsNumber());
234-
int64_t task_id = args[0]->IntegerValue(env->context()).FromJust();
235-
(env->inspector_agent()->*asyncTaskFn)(GetAsyncTask(task_id));
234+
int64_t task_id;
235+
if (args[0]->IntegerValue(env->context()).To(&task_id)) {
236+
(env->inspector_agent()->*asyncTaskFn)(GetAsyncTask(task_id));
237+
}
236238
}
237239

238240
static void AsyncTaskScheduledWrapper(const FunctionCallbackInfo<Value>& args) {
@@ -244,7 +246,10 @@ static void AsyncTaskScheduledWrapper(const FunctionCallbackInfo<Value>& args) {
244246
StringView task_name_view(*task_name_value, task_name_value.length());
245247

246248
CHECK(args[1]->IsNumber());
247-
int64_t task_id = args[1]->IntegerValue(env->context()).FromJust();
249+
int64_t task_id;
250+
if (!args[1]->IntegerValue(env->context()).To(&task_id)) {
251+
return;
252+
}
248253
void* task = GetAsyncTask(task_id);
249254

250255
CHECK(args[2]->IsBoolean());

‎src/module_wrap.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,10 @@ void ModuleWrap::Evaluate(const FunctionCallbackInfo<Value>& args) {
576576
CHECK_EQ(args.Length(), 2);
577577

578578
CHECK(args[0]->IsNumber());
579-
int64_t timeout = args[0]->IntegerValue(realm->context()).FromJust();
579+
int64_t timeout;
580+
if (!args[0]->IntegerValue(realm->context()).To(&timeout)) {
581+
return;
582+
}
580583

581584
CHECK(args[1]->IsBoolean());
582585
bool break_on_sigint = args[1]->IsTrue();

‎src/node_buffer.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ MaybeLocal<Uint8Array> New(Environment* env,
278278
size_t length) {
279279
CHECK(!env->buffer_prototype_object().IsEmpty());
280280
Local<Uint8Array> ui = Uint8Array::New(ab, byte_offset, length);
281-
Maybe<bool> mb =
282-
ui->SetPrototypeV2(env->context(), env->buffer_prototype_object());
283-
if (mb.IsNothing())
281+
if (ui->SetPrototypeV2(env->context(), env->buffer_prototype_object())
282+
.IsNothing()) {
284283
return MaybeLocal<Uint8Array>();
284+
}
285285
return ui;
286286
}
287287

‎src/node_builtins.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ void BuiltinLoader::GetNatives(Local<Name> property,
7979
auto source = env->builtin_loader()->source_.read();
8080
for (auto const& x : *source) {
8181
Local<String> key = OneByteString(isolate, x.first);
82-
out->Set(context, key, x.second.ToStringChecked(isolate)).FromJust();
82+
if (out->Set(context, key, x.second.ToStringChecked(isolate)).IsNothing()) {
83+
return;
84+
}
8385
}
8486
info.GetReturnValue().Set(out);
8587
}

‎src/node_contextify.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,10 @@ void ContextifyScript::RunInContext(const FunctionCallbackInfo<Value>& args) {
12371237
TRACE_EVENT0(TRACING_CATEGORY_NODE2(vm, script), "RunInContext");
12381238

12391239
CHECK(args[1]->IsNumber());
1240-
int64_t timeout = args[1]->IntegerValue(env->context()).FromJust();
1240+
int64_t timeout;
1241+
if (!args[1]->IntegerValue(env->context()).To(&timeout)) {
1242+
return;
1243+
}
12411244

12421245
CHECK(args[2]->IsBoolean());
12431246
bool display_errors = args[2]->IsTrue();

‎src/node_file.cc

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,20 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
254254

255255
std::optional<int64_t> maybeOffset = std::nullopt;
256256
std::optional<int64_t> maybeLength = std::nullopt;
257-
if (args[1]->IsNumber())
258-
maybeOffset = args[1]->IntegerValue(realm->context()).FromJust();
259-
if (args[2]->IsNumber())
260-
maybeLength = args[2]->IntegerValue(realm->context()).FromJust();
257+
if (args[1]->IsNumber()) {
258+
int64_t val;
259+
if (!args[1]->IntegerValue(realm->context()).To(&val)) {
260+
return;
261+
}
262+
maybeOffset = val;
263+
}
264+
if (args[2]->IsNumber()) {
265+
int64_t val;
266+
if (!args[2]->IntegerValue(realm->context()).To(&val)) {
267+
return;
268+
}
269+
maybeLength = val;
270+
}
261271

262272
FileHandle::New(binding_data,
263273
args[0].As<Int32>()->Value(),

‎src/node_messaging.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,9 +1090,10 @@ void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) {
10901090
return;
10911091
}
10921092

1093-
Maybe<bool> res = port->PostMessage(env, context, args[0], transfer_list);
1094-
if (res.IsJust())
1095-
args.GetReturnValue().Set(res.FromJust());
1093+
bool res;
1094+
if (port->PostMessage(env, context, args[0], transfer_list).To(&res)) {
1095+
args.GetReturnValue().Set(res);
1096+
}
10961097
}
10971098

10981099
void MessagePort::Start() {

‎src/node_serdes.cc

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ void SerializerContext::WriteHeader(const FunctionCallbackInfo<Value>& args) {
189189
void SerializerContext::WriteValue(const FunctionCallbackInfo<Value>& args) {
190190
SerializerContext* ctx;
191191
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
192-
Maybe<bool> ret =
193-
ctx->serializer_.WriteValue(ctx->env()->context(), args[0]);
194-
195-
if (ret.IsJust()) args.GetReturnValue().Set(ret.FromJust());
192+
bool ret;
193+
if (ctx->serializer_.WriteValue(ctx->env()->context(), args[0]).To(&ret)) {
194+
args.GetReturnValue().Set(ret);
195+
}
196196
}
197197

198198
void SerializerContext::SetTreatArrayBufferViewsAsHostObjects(
@@ -223,50 +223,55 @@ void SerializerContext::TransferArrayBuffer(
223223
SerializerContext* ctx;
224224
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
225225

226-
Maybe<uint32_t> id = args[0]->Uint32Value(ctx->env()->context());
227-
if (id.IsNothing()) return;
226+
uint32_t id;
227+
if (!args[0]->Uint32Value(ctx->env()->context()).To(&id)) {
228+
return;
229+
}
228230

229-
if (!args[1]->IsArrayBuffer())
231+
if (!args[1]->IsArrayBuffer()) {
230232
return node::THROW_ERR_INVALID_ARG_TYPE(
231233
ctx->env(), "arrayBuffer must be an ArrayBuffer");
234+
}
232235

233236
Local<ArrayBuffer> ab = args[1].As<ArrayBuffer>();
234-
ctx->serializer_.TransferArrayBuffer(id.FromJust(), ab);
235-
return;
237+
ctx->serializer_.TransferArrayBuffer(id, ab);
236238
}
237239

238240
void SerializerContext::WriteUint32(const FunctionCallbackInfo<Value>& args) {
239241
SerializerContext* ctx;
240242
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
241243

242-
Maybe<uint32_t> value = args[0]->Uint32Value(ctx->env()->context());
243-
if (value.IsNothing()) return;
244-
245-
ctx->serializer_.WriteUint32(value.FromJust());
244+
uint32_t value;
245+
if (args[0]->Uint32Value(ctx->env()->context()).To(&value)) {
246+
ctx->serializer_.WriteUint32(value);
247+
}
246248
}
247249

248250
void SerializerContext::WriteUint64(const FunctionCallbackInfo<Value>& args) {
249251
SerializerContext* ctx;
250252
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
251253

252-
Maybe<uint32_t> arg0 = args[0]->Uint32Value(ctx->env()->context());
253-
Maybe<uint32_t> arg1 = args[1]->Uint32Value(ctx->env()->context());
254-
if (arg0.IsNothing() || arg1.IsNothing())
254+
uint32_t hi;
255+
uint32_t lo;
256+
257+
if (!args[0]->Uint32Value(ctx->env()->context()).To(&hi) ||
258+
!args[1]->Uint32Value(ctx->env()->context()).To(&lo)) {
255259
return;
260+
}
256261

257-
uint64_t hi = arg0.FromJust();
258-
uint64_t lo = arg1.FromJust();
259-
ctx->serializer_.WriteUint64((hi << 32) | lo);
262+
uint64_t hiu64 = hi;
263+
uint64_t lou64 = lo;
264+
ctx->serializer_.WriteUint64((hiu64 << 32) | lou64);
260265
}
261266

262267
void SerializerContext::WriteDouble(const FunctionCallbackInfo<Value>& args) {
263268
SerializerContext* ctx;
264269
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
265270

266-
Maybe<double> value = args[0]->NumberValue(ctx->env()->context());
267-
if (value.IsNothing()) return;
268-
269-
ctx->serializer_.WriteDouble(value.FromJust());
271+
double value;
272+
if (args[0]->NumberValue(ctx->env()->context()).To(&value)) {
273+
ctx->serializer_.WriteDouble(value);
274+
}
270275
}
271276

272277
void SerializerContext::WriteRawBytes(const FunctionCallbackInfo<Value>& args) {
@@ -341,9 +346,10 @@ void DeserializerContext::ReadHeader(const FunctionCallbackInfo<Value>& args) {
341346
DeserializerContext* ctx;
342347
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
343348

344-
Maybe<bool> ret = ctx->deserializer_.ReadHeader(ctx->env()->context());
345-
346-
if (ret.IsJust()) args.GetReturnValue().Set(ret.FromJust());
349+
bool ret;
350+
if (ctx->deserializer_.ReadHeader(ctx->env()->context()).To(&ret)) {
351+
args.GetReturnValue().Set(ret);
352+
}
347353
}
348354

349355
void DeserializerContext::ReadValue(const FunctionCallbackInfo<Value>& args) {
@@ -361,18 +367,20 @@ void DeserializerContext::TransferArrayBuffer(
361367
DeserializerContext* ctx;
362368
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
363369

364-
Maybe<uint32_t> id = args[0]->Uint32Value(ctx->env()->context());
365-
if (id.IsNothing()) return;
370+
uint32_t id;
371+
if (!args[0]->Uint32Value(ctx->env()->context()).To(&id)) {
372+
return;
373+
}
366374

367375
if (args[1]->IsArrayBuffer()) {
368376
Local<ArrayBuffer> ab = args[1].As<ArrayBuffer>();
369-
ctx->deserializer_.TransferArrayBuffer(id.FromJust(), ab);
377+
ctx->deserializer_.TransferArrayBuffer(id, ab);
370378
return;
371379
}
372380

373381
if (args[1]->IsSharedArrayBuffer()) {
374382
Local<SharedArrayBuffer> sab = args[1].As<SharedArrayBuffer>();
375-
ctx->deserializer_.TransferSharedArrayBuffer(id.FromJust(), sab);
383+
ctx->deserializer_.TransferSharedArrayBuffer(id, sab);
376384
return;
377385
}
378386

@@ -433,9 +441,11 @@ void DeserializerContext::ReadRawBytes(
433441
DeserializerContext* ctx;
434442
ASSIGN_OR_RETURN_UNWRAP(&ctx, args.This());
435443

436-
Maybe<int64_t> length_arg = args[0]->IntegerValue(ctx->env()->context());
437-
if (length_arg.IsNothing()) return;
438-
size_t length = length_arg.FromJust();
444+
int64_t length_arg;
445+
if (!args[0]->IntegerValue(ctx->env()->context()).To(&length_arg)) {
446+
return;
447+
}
448+
size_t length = length_arg;
439449

440450
const void* data;
441451
bool ok = ctx->deserializer_.ReadRawBytes(length, &data);

‎src/node_sqlite.cc

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,11 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
984984
Local<Object> options = args[0].As<Object>();
985985

986986
Local<String> table_key = FIXED_ONE_BYTE_STRING(env->isolate(), "table");
987-
if (options->HasOwnProperty(env->context(), table_key).FromJust()) {
987+
bool hasIt;
988+
if (!options->HasOwnProperty(env->context(), table_key).To(&hasIt)) {
989+
return;
990+
}
991+
if (hasIt) {
988992
Local<Value> table_value;
989993
if (!options->Get(env->context(), table_key).ToLocal(&table_value)) {
990994
return;
@@ -1002,7 +1006,10 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
10021006

10031007
Local<String> db_key = FIXED_ONE_BYTE_STRING(env->isolate(), "db");
10041008

1005-
if (options->HasOwnProperty(env->context(), db_key).FromJust()) {
1009+
if (!options->HasOwnProperty(env->context(), db_key).To(&hasIt)) {
1010+
return;
1011+
}
1012+
if (hasIt) {
10061013
Local<Value> db_value;
10071014
if (!options->Get(env->context(), db_key).ToLocal(&db_value)) {
10081015
// An error will have been scheduled.
@@ -1221,8 +1228,12 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
12211228
};
12221229
}
12231230

1224-
if (options->HasOwnProperty(env->context(), env->filter_string())
1225-
.FromJust()) {
1231+
bool hasIt;
1232+
if (!options->HasOwnProperty(env->context(), env->filter_string())
1233+
.To(&hasIt)) {
1234+
return;
1235+
}
1236+
if (hasIt) {
12261237
Local<Value> filterValue;
12271238
if (!options->Get(env->context(), env->filter_string())
12281239
.ToLocal(&filterValue)) {

0 commit comments

Comments
 (0)