Skip to content

dns: fix crash while setting server during query #14891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
XadillaX wants to merge 5 commits into from
Closed

dns: fix crash while setting server during query #14891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3bb82a
dns: fix crash while setting server during query
XadillaX Nov 15, 2017
3af0573
fix a typo
XadillaX Nov 15, 2017
f7db3d6
update based on @addaleax' advise
XadillaX Dec 5, 2017
caab532
update after @BridgeAR's reviewing
XadillaX Dec 6, 2017
ac04c85
fix a lint nit
XadillaX Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update based on @addaleax' advise
  • Loading branch information
@XadillaX
XadillaX committed Dec 5, 2017
commit f7db3d66eb38aacdee4a67fa0350ded1c60e5230
33 changes: 33 additions & 0 deletions test/parallel/test-dns-setserver-when-querying.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
'use strict';

const common = require('../common');
const assert = require('assert');

const dns = require('dns');

const goog = [
'8.8.8.8',
'8.8.4.4',
];

{
// Fix https://github.com/nodejs/node/issues/14734
const resolver = new dns.Resolver();
resolver.resolve('localhost', function(err/*, ret*/) {
// nothing
});

assert.throws(() => {
resolver.setServers(goog);
}, common.expectsError({
code: 'ERR_DNS_SET_SERVERS_FAILED',
message: /^c-ares failed to set servers: "There are pending queries\." \[.+\]$/g
}));
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Dec 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tiny nit

You could use common.expectsError(throwingFn, errorObj) instead of assert.throws(throwingFn, common.expectsError(errorObj)).


dns.resolve('localhost', function(err/*, ret*/) {
// nothing
});
Copy link
Copy Markdown
Member

@BridgeAR BridgeAR Dec 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use common.mustCall for the noop functions in this test? Or are they actually not called at all? In that case a mustNotCall could be used.


// should not throw
dns.setServers(goog);
}
22 changes: 0 additions & 22 deletions test/parallel/test-dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,25 +244,3 @@ assert.throws(() => {
code: 'ERR_INVALID_CALLBACK',
type: TypeError
}));

{
// Fix https://github.com/nodejs/node/issues/14734
const resolver = new dns.Resolver();
resolver.resolve('localhost', function(err/*, ret*/) {
// nothing
});

assert.throws(() => {
resolver.setServers(goog);
}, common.expectsError({
code: 'ERR_DNS_SET_SERVERS_FAILED',
message: /^c-ares failed to set servers: "There are pending queries\." \[.+\]$/g
}));

dns.resolve('localhost', function(err/*, ret*/) {
// nothing
});

// should not throw
dns.setServers(goog);
}