Skip to content

Commit 02b1df9

Browse files
addaleaxtargos
authored andcommitted
src: fix crash in AfterGetAddrInfo
Remove invalid usage of `Check()`. This addresses: FATAL ERROR: v8::FromJust Maybe value is Nothing. 1: 0x101311bf5 node::Abort() (.cold.1) [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 2: 0x1000ade29 node::Abort() [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 3: 0x1000adf8f node::OnFatalError(char const*, char const*) [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 4: 0x1001f42d0 v8::V8::FromJustIsNothing() [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 5: 0x1000268e2 node::cares_wrap::(anonymous namespace)::AfterGetAddrInfo(uv_getaddrinfo_s*, int, addrinfo*)::$_2::operator()(bool, bool) const [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 6: 0x10002657c node::cares_wrap::(anonymous namespace)::AfterGetAddrInfo(uv_getaddrinfo_s*, int, addrinfo*) [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 7: 0x1009fb388 uv__work_done [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 8: 0x100a00453 uv__async_io [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 9: 0x100a140cc uv__io_poll [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 10: 0x100a009c1 uv_run [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 11: 0x10014aca0 node::worker::Worker::Run() [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 12: 0x10014e56f node::worker::Worker::StartThread(v8::FunctionCallbackInfo<v8::Value> const&)::$_3::__invoke(void*) [/Users/xxx/.nvm/versions/node/v14.17.4/bin/node] 13: 0x7fff703d42eb _pthread_body [/usr/lib/system/libsystem_pthread.dylib] 14: 0x7fff703d7249 _pthread_start [/usr/lib/system/libsystem_pthread.dylib] 15: 0x7fff703d340d thread_start [/usr/lib/system/libsystem_pthread.dylib] PR-URL: #39735 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 5459f4a commit 02b1df9

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

src/cares_wrap.cc

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ using v8::HandleScope;
6363
using v8::Int32;
6464
using v8::Integer;
6565
using v8::Isolate;
66+
using v8::Just;
6667
using v8::Local;
68+
using v8::Maybe;
69+
using v8::Nothing;
6770
using v8::Null;
6871
using v8::Object;
6972
using v8::String;
@@ -1443,7 +1446,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
14431446
if (status == 0) {
14441447
Local<Array> results = Array::New(env->isolate());
14451448

1446-
auto add = [&] (bool want_ipv4, bool want_ipv6) {
1449+
auto add = [&] (bool want_ipv4, bool want_ipv6) -> Maybe<bool> {
14471450
for (auto p = res; p != nullptr; p = p->ai_next) {
14481451
CHECK_EQ(p->ai_socktype, SOCK_STREAM);
14491452

@@ -1463,14 +1466,19 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
14631466
continue;
14641467

14651468
Local<String> s = OneByteString(env->isolate(), ip);
1466-
results->Set(env->context(), n, s).Check();
1469+
if (results->Set(env->context(), n, s).IsNothing())
1470+
return Nothing<bool>();
14671471
n++;
14681472
}
1473+
return Just(true);
14691474
};
14701475

1471-
add(true, verbatim);
1472-
if (verbatim == false)
1473-
add(false, true);
1476+
if (add(true, verbatim).IsNothing())
1477+
return;
1478+
if (verbatim == false) {
1479+
if (add(false, true).IsNothing())
1480+
return;
1481+
}
14741482

14751483
// No responses were found to return
14761484
if (n == 0) {

0 commit comments

Comments
 (0)