Enforce length/size limits for variable size heap object in order to

lib/byte_array.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 "vm/bootstrap_natives.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 
 namespace dart {
 
 // ByteArray
 
 static void RangeCheck(const ByteArray& array,
                        intptr_t index,
                        intptr_t num_bytes) {
   if (!Utils::RangeCheck(index, num_bytes, array.ByteLength())) {
     GrowableArray<const Object*> arguments;
     const Smi &index_object = Smi::Handle(Smi::New(index));
     arguments.Add(&index_object);

[cshapiro, 2012/07/17 22:54:30]

Out of the kindness of your heart, please make this error message a string with
a descriptive error message.

[turnidge, 2012/07/18 18:17:04]

Done.

     Exceptions::ThrowByType(Exceptions::kIndexOutOfRange, arguments);
   }
 }
 
 
 #define GETTER_ARGUMENTS(ArrayT, ValueT)                                \
   GET_NATIVE_ARGUMENT(ArrayT, array, arguments->At(0));                 \
   GET_NATIVE_ARGUMENT(Smi, index, arguments->At(1));
 
 
@@ skipping 220 matching lines @@
   RangeCheck(src, src_start_value, length_value);
   RangeCheck(dst, dst_start_value, length_value);
   ByteArray::Copy(dst, dst_start_value, src, src_start_value, length_value);
 }
 
 
 // Int8Array
 
 DEFINE_NATIVE_ENTRY(Int8Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Int8Array::kMaxElements) {

[cshapiro, 2012/07/17 22:54:30]

Maybe some derivative or close cousin to the RangeCheck above (including
exception throwing).

[turnidge, 2012/07/18 18:17:04]

Done.

+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Int8Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Int8Array& new_array =
-      Int8Array::Handle(Int8Array::New(length.Value()));
+  const Int8Array& new_array = Int8Array::Handle(Int8Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_getIndexed, 2) {
   GETTER(Int8Array, Smi, int8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_setIndexed, 3) {
   SETTER(Int8Array, Smi, Value, int8_t);
 }
 
 
 // Uint8Array
 
 DEFINE_NATIVE_ENTRY(Uint8Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Uint8Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Uint8Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Uint8Array& new_array =
-      Uint8Array::Handle(Uint8Array::New(length.Value()));
+  const Uint8Array& new_array = Uint8Array::Handle(Uint8Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_getIndexed, 2) {
   GETTER(Uint8Array, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_setIndexed, 3) {
   SETTER(Uint8Array, Smi, Value, uint8_t);
 }
 
 
 // Int16Array
 
 DEFINE_NATIVE_ENTRY(Int16Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Int16Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Int16Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Int16Array& new_array =
-      Int16Array::Handle(Int16Array::New(length.Value()));
+  const Int16Array& new_array = Int16Array::Handle(Int16Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_getIndexed, 2) {
   GETTER(Int16Array, Smi, int16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_setIndexed, 3) {
   SETTER(Int16Array, Smi, Value, int16_t);
 }
 
 
 // Uint16Array
 
 DEFINE_NATIVE_ENTRY(Uint16Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Uint16Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Uint16Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Uint16Array& new_array =
-      Uint16Array::Handle(Uint16Array::New(length.Value()));
+  const Uint16Array& new_array = Uint16Array::Handle(Uint16Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_getIndexed, 2) {
   GETTER(Uint16Array, Smi, uint16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_setIndexed, 3) {
   SETTER(Uint16Array, Smi, Value, uint16_t);
 }
 
 
 // Int32Array
 
 DEFINE_NATIVE_ENTRY(Int32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Int32Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Int32Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Int32Array& new_array =
-      Int32Array::Handle(Int32Array::New(length.Value()));
+  const Int32Array& new_array = Int32Array::Handle(Int32Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_getIndexed, 2) {
   GETTER(Int32Array, Integer, int32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_setIndexed, 3) {
   SETTER(Int32Array, Integer, AsInt64Value, int32_t);
 }
 
 
 // Uint32Array
 
 DEFINE_NATIVE_ENTRY(Uint32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Uint32Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Uint32Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Uint32Array& new_array =
-      Uint32Array::Handle(Uint32Array::New(length.Value()));
+  const Uint32Array& new_array = Uint32Array::Handle(Uint32Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_getIndexed, 2) {
   GETTER(Uint32Array, Integer, uint32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_setIndexed, 3) {
   SETTER(Uint32Array, Integer, AsInt64Value, uint32_t);
 }
 
 
 // Int64Array
 
 DEFINE_NATIVE_ENTRY(Int64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Int64Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Int64Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Int64Array& new_array =
-      Int64Array::Handle(Int64Array::New(length.Value()));
+  const Int64Array& new_array = Int64Array::Handle(Int64Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_getIndexed, 2) {
   GETTER(Int64Array, Integer, int64_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_setIndexed, 3) {
   SETTER(Int64Array, Integer, AsInt64Value, int64_t);
 }
 
 
 // Uint64Array
 
 DEFINE_NATIVE_ENTRY(Uint64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Uint64Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Uint64Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Uint64Array& new_array =
-      Uint64Array::Handle(Uint64Array::New(length.Value()));
+  const Uint64Array& new_array = Uint64Array::Handle(Uint64Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_getIndexed, 2) {
   GETTER_UINT64(Uint64Array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_setIndexed, 3) {
   SETTER_UINT64(Uint64Array);
 }
 
 
 // Float32Array
 
 DEFINE_NATIVE_ENTRY(Float32Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Float32Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Float32Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Float32Array& new_array =
-      Float32Array::Handle(Float32Array::New(length.Value()));
+  const Float32Array& new_array = Float32Array::Handle(Float32Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_getIndexed, 2) {
   GETTER(Float32Array, Double, float);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_setIndexed, 3) {
   SETTER(Float32Array, Double, value, float);
 }
 
 
 // Float64Array
 
 DEFINE_NATIVE_ENTRY(Float64Array_new, 1) {
   GET_NATIVE_ARGUMENT(Smi, length, arguments->At(0));
-  if (length.Value() < 0) {
+  intptr_t len = length.Value();
+  if (len < 0 || len > Float64Array::kMaxElements) {
+    const String& error = String::Handle(String::NewFormatted(
+        "length (%ld) must be in the range [0..%ld]",
+        len, Float64Array::kMaxElements));
     GrowableArray<const Object*> args;
-    args.Add(&length);
+    args.Add(&error);
     Exceptions::ThrowByType(Exceptions::kIllegalArgument, args);
   }
-  const Float64Array& new_array =
-      Float64Array::Handle(Float64Array::New(length.Value()));
+  const Float64Array& new_array = Float64Array::Handle(Float64Array::New(len));
   arguments->SetReturn(new_array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_getIndexed, 2) {
   GETTER(Float64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_setIndexed, 3) {
@@ skipping 114 matching lines @@
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_getIndexed, 2) {
   GETTER(ExternalFloat64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_setIndexed, 3) {
   SETTER(ExternalFloat64Array, Double, value, double);
 }
 
 }  // namespace dart