Experimental parser: merge to r19637

src/typedarray.js

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 40 matching lines @@
   function NAMEConstructByArrayBuffer(obj, buffer, byteOffset, length) {
     var bufferByteLength = buffer.byteLength;
     var offset;
     if (IS_UNDEFINED(byteOffset)) {
       offset = 0;
     } else {
       offset = ToPositiveInteger(byteOffset, "invalid_typed_array_length");
 
       if (offset % ELEMENT_SIZE !== 0) {
         throw MakeRangeError("invalid_typed_array_alignment",
-            "start offset", "NAME", ELEMENT_SIZE);
+            ["start offset", "NAME", ELEMENT_SIZE]);
       }
       if (offset > bufferByteLength) {
         throw MakeRangeError("invalid_typed_array_offset");
       }
     }
 
     var newByteLength;
     var newLength;
     if (IS_UNDEFINED(length)) {
       if (bufferByteLength % ELEMENT_SIZE !== 0) {
         throw MakeRangeError("invalid_typed_array_alignment",
-          "byte length", "NAME", ELEMENT_SIZE);
+          ["byte length", "NAME", ELEMENT_SIZE]);
       }
       newByteLength = bufferByteLength - offset;
       newLength = newByteLength / ELEMENT_SIZE;
     } else {
       var newLength = ToPositiveInteger(length, "invalid_typed_array_length");
       newByteLength = newLength * ELEMENT_SIZE;
     }
     if ((offset + newByteLength > bufferByteLength)
         || (newLength > %MaxSmi())) {
       throw MakeRangeError("invalid_typed_array_length");
@@ skipping 152 matching lines @@
   for (i = leftIndex; i <= rightIndex; i++) {
     target[offset + i] = temp[i - leftIndex];
   }
 }
 
 function TypedArraySet(obj, offset) {
   var intOffset = IS_UNDEFINED(offset) ? 0 : TO_INTEGER(offset);
   if (intOffset < 0) {
     throw MakeTypeError("typed_array_set_negative_offset");
   }
+
+  if (intOffset > %MaxSmi()) {
+    throw MakeRangeError("typed_array_set_source_too_large");
+  }
   switch (%TypedArraySetFastCases(this, obj, intOffset)) {
     // These numbers should be synchronized with runtime.cc.
     case 0: // TYPED_ARRAY_SET_TYPED_ARRAY_SAME_TYPE
       return;
     case 1: // TYPED_ARRAY_SET_TYPED_ARRAY_OVERLAPPING
       TypedArraySetFromOverlappingTypedArray(this, obj, intOffset);
       return;
     case 2: // TYPED_ARRAY_SET_TYPED_ARRAY_NONOVERLAPPING
       TypedArraySetFromArrayLike(this, obj, obj.length, intOffset);
       return;
@@ skipping 180 matching lines @@
 
       "getFloat32", DataViewGetFloat32,
       "setFloat32", DataViewSetFloat32,
 
       "getFloat64", DataViewGetFloat64,
       "setFloat64", DataViewSetFloat64
   ));
 }
 
 SetupDataView();