Add test that passes invalid arguments to socket methods and fix

runtime/bin/socket.cc

 // Copyright (c) 2012, 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/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
 #include "platform/globals.h"
 #include "platform/thread.h"
 #include "platform/utils.h"
 
 #include "include/dart_api.h"
 
 dart::Mutex Socket::mutex_;
 int Socket::service_ports_size_ = 0;
 Dart_Port* Socket::service_ports_ = NULL;
 int Socket::service_ports_index_ = 0;
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   const char* host = DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
-  int64_t port = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
-  intptr_t socket = Socket::CreateConnect(host, port);
-  if (socket >= 0) {
-    DartUtils::SetIntegerField(socketobj, DartUtils::kIdFieldName, socket);
-    Dart_SetReturnValue(args, Dart_True());
+  int64_t port = 0;
+  if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
+    intptr_t socket = Socket::CreateConnect(host, port);
+    if (socket >= 0) {
+      DartUtils::SetIntegerField(socket_obj, DartUtils::kIdFieldName, socket);
+      Dart_SetReturnValue(args, Dart_True());
+    } else {
+      Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+    }
   } else {
-    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+    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_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   Dart_EnterScope();
   int64_t socket = DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                               DartUtils::kIdFieldName);
   intptr_t available = Socket::Available(socket);
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_ReadList)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
-  ASSERT(Dart_IsList(buffer_obj));
-  intptr_t offset =
-      DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
-  intptr_t length =
-      DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
-  intptr_t buffer_len = 0;
-  Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
-  if (Dart_IsError(result)) {
-    Dart_PropagateError(result);
-  }
-  ASSERT((offset + length) <= buffer_len);
-
-  if (Dart_IsVMFlagSet("short_socket_read")) {
-    length = (length + 1) / 2;
+  int64_t offset = 0;
+  int64_t length = 0;
+  Dart_Handle offset_obj = Dart_GetNativeArgument(args, 2);
+  Dart_Handle length_obj = Dart_GetNativeArgument(args, 3);
+  if (Dart_IsList(buffer_obj) &&
+      DartUtils::GetInt64Value(offset_obj, &offset) &&
+      DartUtils::GetInt64Value(length_obj, &length)) {
+    intptr_t buffer_len = 0;
+    Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
+    if (Dart_IsError(result)) {
+      Dart_PropagateError(result);
+    }
+    ASSERT((offset + length) <= buffer_len);
+    if (Dart_IsVMFlagSet("short_socket_read")) {
+      length = (length + 1) / 2;
+    }
+    uint8_t* buffer = new uint8_t[length];
+    intptr_t bytes_read = Socket::Read(socket, buffer, length);
+    if (bytes_read > 0) {
+      Dart_Handle result =
+          Dart_ListSetAsBytes(buffer_obj, offset, buffer, bytes_read);
+      if (Dart_IsError(result)) {
+        delete[] buffer;
+        Dart_PropagateError(result);
+      }
+    }
+    delete[] buffer;
+    if (bytes_read >= 0) {
+      Dart_SetReturnValue(args, Dart_NewInteger(bytes_read));
+    } else {
+      Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+    }
+  } 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);
   }
 
-  uint8_t* buffer = new uint8_t[length];
-  intptr_t bytes_read = Socket::Read(socket, buffer, length);
-  if (bytes_read > 0) {
-    Dart_Handle result =
-        Dart_ListSetAsBytes(buffer_obj, offset, buffer, bytes_read);
-    if (Dart_IsError(result)) {
-      delete[] buffer;
-      Dart_PropagateError(result);
-    }
-  }
-  delete[] buffer;
-  if (bytes_read >= 0) {
-    Dart_SetReturnValue(args, Dart_NewInteger(bytes_read));
-  } else {
-    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
-  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
@@ skipping 87 matching lines @@
                                  DartUtils::kIdFieldName);
   OSError os_error;
   Socket::GetError(socket, &os_error);
   Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t num =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   ASSERT(num == 0 || num == 1 || num == 2);
   intptr_t socket = Socket::GetStdioHandle(num);
   DartUtils::SetIntegerField(
-      socketobj, DartUtils::kIdFieldName, socket);
+      socket_obj, DartUtils::kIdFieldName, socket);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
-  const char* bindAddress =
-      DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
-  intptr_t port = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
-  intptr_t backlog =
-      DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
-  intptr_t socket =
-      ServerSocket::CreateBindListen(bindAddress, port, backlog);
-  if (socket >= 0) {
-    DartUtils::SetIntegerField(
-        socketobj, DartUtils::kIdFieldName, socket);
-    Dart_SetReturnValue(args, Dart_True());
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  Dart_Handle bind_address_obj = Dart_GetNativeArgument(args, 1);
+  Dart_Handle port_obj = Dart_GetNativeArgument(args, 2);
+  Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 3);
+  int64_t port = 0;
+  int64_t backlog = 0;
+  if (Dart_IsString(bind_address_obj) &&
+      DartUtils::GetInt64Value(port_obj, &port) &&
+      DartUtils::GetInt64Value(backlog_obj, &backlog)) {
+    const char* bind_address = DartUtils::GetStringValue(bind_address_obj);

[Søren Gjesse, 2012/05/30 07:07:15]

We could consider having GetStringValue work like GetInt64Value.

[Mads Ager (google), 2012/05/30 07:35:12]

Yes, that could be done. It makes sense to have two version. One that asserts
and one that checks. I'll see if I can streamline that in an upcoming change.

+    intptr_t socket =
+        ServerSocket::CreateBindListen(bind_address, port, backlog);
+    if (socket >= 0) {
+      DartUtils::SetIntegerField(
+          socket_obj, DartUtils::kIdFieldName, socket);
+      Dart_SetReturnValue(args, Dart_True());
+    } else {
+      Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+    }
   } else {
-    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+    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_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
-  Dart_Handle socketobj = Dart_GetNativeArgument(args, 1);
-  intptr_t newSocket = ServerSocket::Accept(socket);
-  if (newSocket >= 0) {
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 1);
+  intptr_t new_socket = ServerSocket::Accept(socket);
+  if (new_socket >= 0) {
     DartUtils::SetIntegerField(
-        socketobj, DartUtils::kIdFieldName, newSocket);
+        socket_obj, DartUtils::kIdFieldName, new_socket);
     Dart_SetReturnValue(args, Dart_True());
-  } else if (newSocket == ServerSocket::kTemporaryFailure) {
+  } else if (new_socket == ServerSocket::kTemporaryFailure) {
     Dart_SetReturnValue(args, Dart_False());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 static CObject* LookupRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
@@ skipping 15 matching lines @@
 }
 
 
 void SocketService(Dart_Port dest_port_id,
                    Dart_Port reply_port_id,
                    Dart_CObject* message) {
   CObject* response = CObject::False();
   CObjectArray request(message);
   if (message->type == Dart_CObject::kArray) {
     if (request.Length() > 1 && request[0]->IsInt32()) {
-      CObjectInt32 requestType(request[0]);
-      switch (requestType.Value()) {
+      CObjectInt32 request_type(request[0]);
+      switch (request_type.Value()) {
         case Socket::kLookupRequest:
           response = LookupRequest(request);
           break;
         default:
           UNREACHABLE();
       }
     }
   }
 
   Dart_PostCObject(reply_port_id, response->AsApiCObject());
@@ skipping 29 matching lines @@
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_Null());
   Dart_Port service_port = Socket::GetServicePort();
   if (service_port != kIllegalPort) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }