Add length checks to ApiMessageWriter.

runtime/bin/dartutils.h

 // 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.
 
 #ifndef BIN_DARTUTILS_H_
 #define BIN_DARTUTILS_H_
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
@@ skipping 253 matching lines @@
 
   static CObject* Null();
   static CObject* True();
   static CObject* False();
   static CObject* Bool(bool value);
   static Dart_CObject* NewInt32(int32_t value);
   static Dart_CObject* NewInt64(int64_t value);
   static Dart_CObject* NewIntptr(intptr_t value);
   // TODO(sgjesse): Add support for kBigint.
   static Dart_CObject* NewDouble(double value);
-  static Dart_CObject* NewString(int length);
+  static Dart_CObject* NewString(intptr_t length);
   static Dart_CObject* NewString(const char* str);
-  static Dart_CObject* NewArray(int length);
-  static Dart_CObject* NewUint8Array(int length);
+  static Dart_CObject* NewArray(intptr_t length);
+  static Dart_CObject* NewUint8Array(intptr_t length);
   static Dart_CObject* NewExternalUint8Array(
-      int64_t length, uint8_t* data, void* peer,
+      intptr_t length, uint8_t* data, void* peer,
       Dart_WeakPersistentHandleFinalizer callback);
-  static Dart_CObject* NewIOBuffer(int64_t length);
+  static Dart_CObject* NewIOBuffer(intptr_t length);
   static void FreeIOBufferData(Dart_CObject* object);
 
   Dart_CObject* AsApiCObject() { return cobject_; }
 
   // Create a new CObject array with an illegal arguments error.
   static CObject* IllegalArgumentError();
   // Create a new CObject array with a file closed error.
   static CObject* FileClosedError();
   // Create a new CObject array with the current OS error.
   static CObject* NewOSError();
@@ skipping 153 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectString);
 };
 
 
 class CObjectArray : public CObject {
  public:
   DECLARE_COBJECT_CONSTRUCTORS(Array)
 
-  int Length() const { return cobject_->value.as_array.length; }
-  CObject* operator[](int index) const {
+  intptr_t Length() const { return cobject_->value.as_array.length; }
+  CObject* operator[](intptr_t index) const {
     return new CObject(cobject_->value.as_array.values[index]);
   }
-  void SetAt(int index, CObject* value) {
+  void SetAt(intptr_t index, CObject* value) {
     cobject_->value.as_array.values[index] = value->AsApiCObject();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectArray);
 };
 
 
 class CObjectTypedData : public CObject {
  public:
   explicit CObjectTypedData(Dart_CObject *cobject) : CObject(cobject) {
     ASSERT(type() == Dart_CObject_kTypedData);
     cobject_ = cobject;
   }
   explicit CObjectTypedData(CObject* cobject) : CObject() {
     ASSERT(cobject != NULL);
     ASSERT(cobject->type() == Dart_CObject_kTypedData);
     cobject_ = cobject->AsApiCObject();
   }
 
   Dart_TypedData_Type Type() const {
     return cobject_->value.as_typed_data.type;
   }
-  int Length() const { return cobject_->value.as_typed_data.length; }
+  intptr_t Length() const { return cobject_->value.as_typed_data.length; }
   uint8_t* Buffer() const { return cobject_->value.as_typed_data.values; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectTypedData);
 };
 
 
 class CObjectUint8Array : public CObject {
  public:
   DECLARE_COBJECT_TYPED_DATA_CONSTRUCTORS(Uint8)
 
-  int Length() const { return cobject_->value.as_typed_data.length; }
+  intptr_t Length() const { return cobject_->value.as_typed_data.length; }
   uint8_t* Buffer() const { return cobject_->value.as_typed_data.values; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectUint8Array);
 };
 
 
 class CObjectExternalUint8Array : public CObject {
  public:
   DECLARE_COBJECT_EXTERNAL_TYPED_DATA_CONSTRUCTORS(Uint8)
 
-  int Length() const { return cobject_->value.as_external_typed_data.length; }
-  void SetLength(uint64_t length) {
+  intptr_t Length() const {
+    return cobject_->value.as_external_typed_data.length;
+  }
+  void SetLength(intptr_t length) {
     cobject_->value.as_external_typed_data.length = length;
   }
   uint8_t* Data() const { return cobject_->value.as_external_typed_data.data; }
   void* Peer() const { return cobject_->value.as_external_typed_data.peer; }
   Dart_WeakPersistentHandleFinalizer Callback() const {
     return cobject_->value.as_external_typed_data.callback;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectExternalUint8Array);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_DARTUTILS_H_