Simplify some argument checking for socket calls

runtime/bin/socket.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/io_buffer.h"
 #include "bin/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 85 matching lines @@
     Dart_SetReturnValue(args, Dart_Null());
   } else {
     Dart_SetReturnValue(args, SocketAddress::ToTypedData(&raw));
   }
 }
 
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   RawAddr addr;
   GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
-  int64_t port = 0;
-  if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
-    intptr_t socket = Socket::CreateConnect(addr, port);
-    OSError error;
-    if (socket >= 0) {
-      Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket);
-      Dart_SetReturnValue(args, Dart_True());
-    } else {
-      Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
-    }
+  int64_t port = DartUtils::GetIntegerValueCheckRange(

[Anders Johnsen, 2013/11/27 12:06:48]

Call it GetInt64ValueCheckRange?

[Søren Gjesse, 2013/11/27 12:11:55]

Done.

+      Dart_GetNativeArgument(args, 2),
+      0,
+      65535);
+  intptr_t socket = Socket::CreateConnect(addr, port);
+  OSError error;
+  if (socket >= 0) {
+    Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket);
+    Dart_SetReturnValue(args, Dart_True());
   } else {
-    OSError os_error(-1, "Invalid argument", OSError::kUnknown);
-    Dart_Handle err = DartUtils::NewDartOSError(&os_error);
-    if (Dart_IsError(err)) Dart_PropagateError(err);
-    Dart_SetReturnValue(args, err);
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
   }
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   intptr_t socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   intptr_t available = Socket::Available(socket);
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
@@ skipping 165 matching lines @@
 
 void FUNCTION_NAME(Socket_SetSocketId)(Dart_NativeArguments args) {
   intptr_t id =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
   Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), id);
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   RawAddr addr;
-  int64_t port = 0;
-  int64_t backlog = 0;
   GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
-  if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port) &&
-      DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 3), &backlog)) {
-    bool v6_only = DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 4));
-    intptr_t socket = ServerSocket::CreateBindListen(
-        addr, port, backlog, v6_only);
-    OSError error;
-    if (socket >= 0) {
-      Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket);
-      Dart_SetReturnValue(args, Dart_True());
+  int64_t port = DartUtils::GetIntegerValueCheckRange(
+      Dart_GetNativeArgument(args, 2),
+      0,
+      65535);
+  int64_t backlog = DartUtils::GetIntegerValueCheckRange(
+      Dart_GetNativeArgument(args, 3),
+      0,
+      65535);
+  bool v6_only = DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 4));
+  intptr_t socket = ServerSocket::CreateBindListen(
+      addr, port, backlog, v6_only);
+  OSError error;
+  if (socket >= 0) {
+    Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket);
+    Dart_SetReturnValue(args, Dart_True());
+  } else {
+    if (socket == -5) {
+      OSError os_error(-1, "Invalid host", OSError::kUnknown);
+      Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
     } else {
-      if (socket == -5) {
-        OSError os_error(-1, "Invalid host", OSError::kUnknown);
-        Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
-      } else {
-        Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
-      }
+      Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
     }
-  } else {
-    OSError os_error(-1, "Invalid argument", OSError::kUnknown);
-    Dart_Handle err = DartUtils::NewDartOSError(&os_error);
-    if (Dart_IsError(err)) Dart_PropagateError(err);
-    Dart_SetReturnValue(args, err);
   }
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
   intptr_t socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   intptr_t new_socket = ServerSocket::Accept(socket);
   if (new_socket >= 0) {
     Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 1), new_socket);
@@ skipping 162 matching lines @@
 intptr_t Socket::GetSocketIdNativeField(Dart_Handle socket_obj) {
   intptr_t socket = 0;
   Dart_Handle err =
       Dart_GetNativeInstanceField(socket_obj, kSocketIdNativeField, &socket);
   if (Dart_IsError(err)) Dart_PropagateError(err);
   return socket;
 }
 
 }  // namespace bin
 }  // namespace dart