diff options
author | Kenan Sulayman <kenan@sly.mn> | 2014-02-07 18:50:29 +0100 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-02-08 02:08:28 +0400 |
commit | 56e80a37e0df0d131d3a3ad6426d52f887ef8e94 (patch) | |
tree | b583978d93567b3c288dfa66a3f6c749f8f9aa48 | |
parent | e3d835902161eab536a1913a3edaa2bb0da9542c (diff) | |
download | node-56e80a37e0df0d131d3a3ad6426d52f887ef8e94.tar.gz |
dns: validate arguments in resolve
Mitigat C++-land assertion error, add test accordingly.
fix #7070
-rw-r--r-- | lib/dns.js | 5 | ||||
-rw-r--r-- | test/simple/test-dns-regress-7070.js | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/lib/dns.js b/lib/dns.js index 10214790d..15ee6a436 100644 --- a/lib/dns.js +++ b/lib/dns.js @@ -146,6 +146,11 @@ function resolver(bindingName) { if (!status) { callback(null, result); } else { + if (!util.isString(name)) + throw new Error('Name must be a string') + else if (!util.isFunction(callback)) + throw new Error('Callback must be a function') + callback(errnoException(process._errno, bindingName)); } } diff --git a/test/simple/test-dns-regress-7070.js b/test/simple/test-dns-regress-7070.js new file mode 100644 index 000000000..849743a82 --- /dev/null +++ b/test/simple/test-dns-regress-7070.js @@ -0,0 +1,27 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var dns = require('dns'); + +// Should not raise assertion error. Issue #7070 +assert.throws(function () { dns.resolveNs([]) }); // bad name +assert.throws(function () { dns.resolveNs("") }); // bad callback |