Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
dns: validate arguments in resolver
Browse files Browse the repository at this point in the history
Mitigate C++-land assertion error, add test accordingly.

Fix #7070
  • Loading branch information
19h authored and indutny committed Feb 9, 2014
1 parent abe4c34 commit 28dbc96
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/dns.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ function resolver(bindingName) {
var binding = cares[bindingName];

return function query(name, callback) {
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 = makeAsync(callback);
var req = {
bindingName: bindingName,
Expand Down
28 changes: 28 additions & 0 deletions test/simple/test-dns-regress-7070.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// 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 assert = require('assert');
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

0 comments on commit 28dbc96

Please sign in to comment.