languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 15:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw an ArgumentError if the port is out of range

Browse source 
fixes #27416

R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2361373003 .
This commit is contained in:
Zachary Anderson 2016-09-23 11:12:54 -07:00
parent 48c6f19600
commit a76aa4e70c
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
runtime/bin/socket_patch.dart
View file

@ -70,6 +70,12 @@
static bool _listSupported() native "NetworkInterface_ListSupported";
}
void _throwOnBadPort(int port) {
if ((port == null) || (port < 0) || (port > 0xFFFF)) {
throw new ArgumentError("Invalid port $port");
}
}
class _InternetAddress implements InternetAddress {
static const int _ADDRESS_LOOPBACK_IP_V4 = 0;
static const int _ADDRESS_LOOPBACK_IP_V6 = 1;
@ -387,6 +393,7 @@ class _NativeSocket extends _NativeSocketNativeWrapper with _ServiceObject {
}
static Future<_NativeSocket> connect(host, int port, sourceAddress) {
_throwOnBadPort(port);
if (sourceAddress != null && sourceAddress is! _InternetAddress) {
if (sourceAddress is String) {
sourceAddress = new InternetAddress(sourceAddress);
@ -488,6 +495,7 @@ class _NativeSocket extends _NativeSocketNativeWrapper with _ServiceObject {
int backlog,
bool v6Only,
bool shared) {
_throwOnBadPort(port);
return new Future.value(host)
.then((host) {
if (host is _InternetAddress) return host;
@ -526,6 +534,7 @@ class _NativeSocket extends _NativeSocketNativeWrapper with _ServiceObject {
static Future<_NativeSocket> bindDatagram(
host, int port, bool reuseAddress) {
_throwOnBadPort(port);
return new Future.value(host)
.then((host) {
if (host is _InternetAddress) return host;
@ -676,6 +685,7 @@ class _NativeSocket extends _NativeSocketNativeWrapper with _ServiceObject {
int send(List<int> buffer, int offset, int bytes,
InternetAddress address, int port) {
_throwOnBadPort(port);
if (isClosing || isClosed) return 0;
_BufferAndStart bufferAndStart =
_ensureFastAndSerializableByteData(
@ -1116,8 +1126,7 @@ class _RawServerSocket extends Stream<RawSocket>
int backlog,
bool v6Only,
bool shared) {
if (port < 0 || port > 0xFFFF)
throw new ArgumentError("Invalid port $port");
_throwOnBadPort(port);
if (backlog < 0) throw new ArgumentError("Invalid backlog $backlog");
return _NativeSocket.bind(address, port, backlog, v6Only, shared)
.then((socket) => new _RawServerSocket(socket, v6Only));
@ -1762,8 +1771,7 @@ class _RawDatagramSocket extends Stream implements RawDatagramSocket {
static Future<RawDatagramSocket> bind(
host, int port, bool reuseAddress) {
if (port < 0 || port > 0xffff)
throw new ArgumentError("Invalid port $port");
_throwOnBadPort(port);
return _NativeSocket.bindDatagram(host, port, reuseAddress)
.then((socket) => new _RawDatagramSocket(socket));
}

21
tests/standalone/io/socket_invalid_arguments_test.dart
View file

@ -20,12 +20,17 @@ class NotAList {
testSocketCreation(host, port) {
asyncStart();
Socket.connect(host, port)
.then((socket) => Expect.fail("Shouldn't get connected"))
.catchError((e) {
Expect.isTrue(e is ArgumentError || e is SocketException);
asyncEnd();
});
try {
Socket.connect(host, port)
.then((socket) => Expect.fail("Shouldn't get connected"))
.catchError((e) {
Expect.isTrue(e is ArgumentError || e is SocketException);
asyncEnd();
});
} catch (e) {
Expect.isTrue(e is ArgumentError || e is SocketException);
asyncEnd();
}
}
testAdd(buffer) {
@ -71,6 +76,8 @@ main() {
testSocketCreation(123, 123);
testSocketCreation("string", null);
testSocketCreation(null, null);
testSocketCreation("localhost", -1);
testSocketCreation("localhost", 65536);
testAdd(null);
testAdd(new NotAList());
testAdd(42);
@ -82,4 +89,6 @@ main() {
testServerSocketCreation(123, 123, 123);
testServerSocketCreation("string", null, null);
testServerSocketCreation("string", 123, null);
testServerSocketCreation("localhost", -1, 123);
testServerSocketCreation("localhost", 65536, 123);
}