dns: use length for building TXT string

addaleax · addaleax · commit f37450f58075 · 2019-11-30T03:58:30.000+01:00
Rely on the length reported by C-Ares rather than `\0`-termination for creating the JS string for a dns TXT response. Fixes: #30688 PR-URL: #30690 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -904,7 +904,8 @@ int ParseTxtReply(Environment* env,
   uint32_t i = 0, j;
   uint32_t offset = ret->Length();
   for (j = 0; current != nullptr; current = current->next) {
-    Local<String> txt = OneByteString(env->isolate(), current->txt);
+    Local<String> txt =
+        OneByteString(env->isolate(), current->txt, current->length);
 
     // New record found - write out the current chunk
     if (current->record_start) {
diff --git a/test/parallel/test-dns-resolveany.js b/test/parallel/test-dns-resolveany.js
@@ -11,7 +11,7 @@ const answers = [
   { type: 'AAAA', address: '::42', ttl: 123 },
   { type: 'MX', priority: 42, exchange: 'foobar.com', ttl: 124 },
   { type: 'NS', value: 'foobar.org', ttl: 457 },
-  { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz' ] },
+  { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz\0foo' ] },
   { type: 'PTR', value: 'baz.org', ttl: 987 },
   {
     type: 'SOA',

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const answers = [`
`11`	`11`	`{ type: 'AAAA', address: '::42', ttl: 123 },`
`12`	`12`	`{ type: 'MX', priority: 42, exchange: 'foobar.com', ttl: 124 },`
`13`	`13`	`{ type: 'NS', value: 'foobar.org', ttl: 457 },`
`14`		`- { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz' ] },`
	`14`	`+ { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz\0foo' ] },`
`15`	`15`	`{ type: 'PTR', value: 'baz.org', ttl: 987 },`
`16`	`16`	`{`
`17`	`17`	`type: 'SOA',`