From a03d31394c8bc1a5a544640644399894651cd40e Mon Sep 17 00:00:00 2001 From: "dslomov@chromium.org" Date: Tue, 4 Feb 2014 09:53:05 +0000 Subject: [PATCH] Check the offset argument of TypedArray.set for fitting into Smi. R=jkummerow@chromium.org BUG=340125 LOG=Y Review URL: https://codereview.chromium.org/145623009 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19051 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/typedarray.js | 4 ++++ test/mjsunit/regress/regress-340125.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 test/mjsunit/regress/regress-340125.js diff --git a/src/typedarray.js b/src/typedarray.js index 21dd9c8..c0f07ed 100644 --- a/src/typedarray.js +++ b/src/typedarray.js @@ -243,6 +243,10 @@ function TypedArraySet(obj, 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 diff --git a/test/mjsunit/regress/regress-340125.js b/test/mjsunit/regress/regress-340125.js new file mode 100644 index 0000000..a3e40a8 --- /dev/null +++ b/test/mjsunit/regress/regress-340125.js @@ -0,0 +1,30 @@ +// Copyright 2014 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 +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +var a = new Int8Array(2); +var b = a.subarray(2, 4); +assertThrows(function () { a.set(b, 1e10); }, RangeError); -- 2.7.4