1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: add a port validation to connect

Browse Source 
Fix "Assertion failed" when trying to connect to non-int ports:

    Assertion failed: (args[2]->Uint32Value()), function Connect,
    file ../src/tcp_wrap.cc, line 379.
    Abort trap: 6
This commit is contained in:
Maciej Małecki 2013-09-04 18:57:43 -04:00 committed by Ben Noordhuis
parent a1cf3ada62
commit d80d131c75
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/net.js
View File

@ -794,10 +794,16 @@ function connect(self, address, port, addressType, localAddress) {
} }
var req = { oncomplete: afterConnect }; var req = { oncomplete: afterConnect };
if (addressType == 6) { if (addressType === 6 || addressType === 4) {
err = self._handle.connect6(req, address, port); port = port | 0;
} else if (addressType == 4) { if (port <= 0 || port > 65535)
err = self._handle.connect(req, address, port); throw new RangeError('Port should be > 0 and < 65536');
if (addressType === 6) {
err = self._handle.connect6(req, address, port);
} else if (addressType === 4) {
err = self._handle.connect(req, address, port);
}
} else { } else {
err = self._handle.connect(req, address, afterConnect); err = self._handle.connect(req, address, afterConnect);
} }

6
test/simple/test-net-create-connection.js
View File

@ -42,6 +42,12 @@ server.listen(tcpPort, 'localhost', function() {
net.createConnection(tcpPort, 'localhost').on('connect', cb); net.createConnection(tcpPort, 'localhost').on('connect', cb);
net.createConnection(tcpPort, cb); net.createConnection(tcpPort, cb);
net.createConnection(tcpPort, 'localhost', cb); net.createConnection(tcpPort, 'localhost', cb);
assert.throws(function () {
net.createConnection({
port: 'invalid!'
}, cb);
});
}); });
process.on('exit', function() { process.on('exit', function() {