From d93f93aa99aead77fb52d16a0d8f7d9af047a69a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 22 Dec 2018 21:18:13 +0100 Subject: dns: fix TTL value for AAAA replies to `resolveAny()` We were previously reading from the wrong offset, namely the one into the final results array, not the one for the AAAA results itself, which could have lead to reading uninitialized or out-of-bounds data. Also, adjust the test accordingly; TTL values are not modified by c-ares, but are only exposed for a subset of all DNS record types. PR-URL: https://github.com/nodejs/node/pull/25187 Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Khaidi Chu Reviewed-By: Ben Noordhuis Reviewed-By: Ruben Bridgewater --- src/cares_wrap.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/cares_wrap.cc') diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index a3bcdf89535..9d7af47dcdb 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -1265,6 +1265,7 @@ class QueryAnyWrap: public QueryWrap { } CHECK_EQ(aaaa_count, naddr6ttls); + CHECK_EQ(ret->Length(), a_count + aaaa_count); for (uint32_t i = a_count; i < ret->Length(); i++) { Local obj = Object::New(env()->isolate()); obj->Set(context, @@ -1272,7 +1273,8 @@ class QueryAnyWrap: public QueryWrap { ret->Get(context, i).ToLocalChecked()).FromJust(); obj->Set(context, env()->ttl_string(), - Integer::New(env()->isolate(), addr6ttls[i].ttl)).FromJust(); + Integer::New(env()->isolate(), addr6ttls[i - a_count].ttl)) + .FromJust(); obj->Set(context, env()->type_string(), env()->dns_aaaa_string()).FromJust(); -- cgit v1.2.3