src: fix intermittent SIGSEGV in resolveTxt

Fixes a SIGSEGV by making sure `txt_chunk` is not empty before setting it on `txt_records` Fixes: #9285 PR-URL: #9300 Reviewed-By: cjihrig - Colin Ihrig <[email protected]> Reviewed-By: jasnell - James M Snell <[email protected]>
nodejs · Aug 27, 2015 · 261fa36 · 261fa36
1 parent 1f7257b
commit 261fa36
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -633,8 +633,9 @@ class QueryTxtWrap: public QueryWrap {
       }
       txt_chunk->Set(j++, txt);
     }
-    // Push last chunk
-    txt_records->Set(i, txt_chunk);
+    // Push last chunk if it isn't empty
+    if (!txt_chunk.IsEmpty())
+      txt_records->Set(i, txt_chunk);
 
     ares_free_data(txt_out);
 

diff --git a/test/internet/test-dns-txt-sigsegv.js b/test/internet/test-dns-txt-sigsegv.js
@@ -0,0 +1,8 @@
+var common = require('../common');
+var assert = require('assert');
+var dns = require('dns');
+
+dns.resolveTxt('www.microsoft.com', function(err, records) {
+  assert.equal(err, null);
+  assert.equal(records.length, 0);
+});