From 28ed69b8fb4463063c4351d5f06e4854432d441a Mon Sep 17 00:00:00 2001 From: "danno@chromium.org" Date: Thu, 14 Nov 2013 06:20:48 +0000 Subject: [PATCH] Fix overflow in TypedArray initialization function BUG=chromium:319120 TEST=test/mjsunit/regress/regress-319120.js R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/61753013 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17711 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/runtime.cc | 4 ++-- test/mjsunit/regress/regress-319120.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/regress/regress-319120.js diff --git a/src/runtime.cc b/src/runtime.cc index 9d317ca..80b6827 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -956,12 +956,12 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_TypedArrayInitializeFromArrayLike) { Handle buffer = isolate->factory()->NewJSArrayBuffer(); size_t length = NumberToSize(isolate, *length_obj); - size_t byte_length = length * element_size; - if (byte_length < length) { // Overflow + if (length > (kMaxInt / element_size)) { return isolate->Throw(*isolate->factory()-> NewRangeError("invalid_array_buffer_length", HandleVector(NULL, 0))); } + size_t byte_length = length * element_size; // NOTE: not initializing backing store. // We assume that the caller of this function will initialize holder diff --git a/test/mjsunit/regress/regress-319120.js b/test/mjsunit/regress/regress-319120.js new file mode 100644 index 0000000..2899da2 --- /dev/null +++ b/test/mjsunit/regress/regress-319120.js @@ -0,0 +1,28 @@ +// 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 +// 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. + +assertThrows('x = new Float64Array({length: 0x24924925})'); -- 2.7.4