FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

dns: coerce -0 to +0 in lookup and resolver inputs · nodejs/node@0cf8342 · GitHub

/ node Public

Commit 0cf8342

Browse files
panva
authored and
aduh95
committed
dns: coerce -0 to +0 in lookup and resolver inputs
Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #63556 Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 9984b05 commit 0cf8342

4 files changed

Lines changed: 30 additions & 7 deletions

File tree

‎lib/dns.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ function lookup(hostname, options, callback) {
157157
validateFunction(callback, 'callback');
158158

159159
validateOneOf(options, 'family', validFamilies);
160-
family = options;
160+
// Coerce -0 to +0.
161+
family = options + 0;
161162
} else if (options !== undefined && typeof options !== 'object') {
162163
validateFunction(arguments.length === 2 ? options : callback, 'callback');
163164
throw new ERR_INVALID_ARG_TYPE('options', ['integer', 'object'], options);
@@ -179,7 +180,8 @@ function lookup(hostname, options, callback) {
179180
break;
180181
default:
181182
validateOneOf(options.family, 'options.family', validFamilies);
182-
family = options.family;
183+
// Coerce -0 to +0.
184+
family = options.family + 0;
183185
break;
184186
}
185187
}
@@ -274,7 +276,8 @@ function lookupService(address, port, callback) {
274276

275277
validateFunction(callback, 'callback');
276278

277-
port = +port;
279+
// Coerce -0 to +0.
280+
port = +port + 0;
278281

279282
const req = new GetNameInfoReqWrap();
280283
req.callback = callback;

‎lib/internal/dns/promises.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ function lookup(hostname, options) {
206206

207207
if (typeof options === 'number') {
208208
validateOneOf(options, 'family', validFamilies);
209-
family = options;
209+
// Coerce -0 to +0.
210+
family = options + 0;
210211
} else if (options !== undefined && typeof options !== 'object') {
211212
throw new ERR_INVALID_ARG_TYPE('options', ['integer', 'object'], options);
212213
} else {
@@ -217,7 +218,8 @@ function lookup(hostname, options) {
217218
}
218219
if (options?.family != null) {
219220
validateOneOf(options.family, 'options.family', validFamilies);
220-
family = options.family;
221+
// Coerce -0 to +0.
222+
family = options.family + 0;
221223
}
222224
if (options?.all != null) {
223225
validateBoolean(options.all, 'options.all');

‎lib/internal/dns/utils.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,18 @@ const {
4545
} = require('internal/v8/startup_snapshot');
4646

4747
function validateTimeout(options) {
48-
const { timeout = -1 } = { ...options };
48+
let { timeout = -1 } = { ...options };
4949
validateInt32(timeout, 'options.timeout', -1);
50+
// Coerce -0 to +0.
51+
timeout += 0;
5052
return timeout;
5153
}
5254

5355
function validateMaxTimeout(options) {
54-
const { maxTimeout = 0 } = { ...options };
56+
let { maxTimeout = 0 } = { ...options };
5557
validateUint32(maxTimeout, 'options.maxTimeout');
58+
// Coerce -0 to +0.
59+
maxTimeout += 0;
5660
return maxTimeout;
5761
}
5862

‎test/parallel/test-dns-negative-zero.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
5+
const dns = require('dns');
6+
7+
dns.lookup('localhost', -0, common.mustCall());
8+
dns.lookup('localhost', { family: -0 }, common.mustCall());
9+
dns.lookupService('127.0.0.1', -0, common.mustCall());
10+
11+
new dns.Resolver({ timeout: -0 });
12+
new dns.Resolver({ maxTimeout: -0 });
13+
14+
dns.promises.lookup('localhost', { family: -0 }).then(common.mustCall());

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL