From 5ccd697875d9ebff4b68e33c49f92f16e472119d Mon Sep 17 00:00:00 2001 From: "dslomov@chromium.org" Date: Tue, 15 Oct 2013 11:27:12 +0000 Subject: [PATCH] Do not look up ArrayBuffer on global object in typed array constructor. BUG=v8:2931 R=rossberg@chromium.org Review URL: https://codereview.chromium.org/27238009 Patch from Ben Noordhuis . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17215 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/typedarray.js | 4 ++-- test/mjsunit/regress/regress-2931.js | 34 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/regress/regress-2931.js diff --git a/src/typedarray.js b/src/typedarray.js index da12ccf323..1e67bc30c6 100644 --- a/src/typedarray.js +++ b/src/typedarray.js @@ -30,7 +30,7 @@ // This file relies on the fact that the following declaration has been made // in runtime.js: // var $Array = global.Array; - +var $ArrayBuffer = global.ArrayBuffer; // --------------- Typed Arrays --------------------- @@ -70,7 +70,7 @@ function CreateTypedArrayConstructor(name, elementSize, arrayId, constructor) { function ConstructByLength(obj, length) { var l = ToPositiveInteger(length, "invalid_typed_array_length"); var byteLength = l * elementSize; - var buffer = new global.ArrayBuffer(byteLength); + var buffer = new $ArrayBuffer(byteLength); %TypedArrayInitialize(obj, arrayId, buffer, 0, byteLength); } diff --git a/test/mjsunit/regress/regress-2931.js b/test/mjsunit/regress/regress-2931.js new file mode 100644 index 0000000000..a2ea912682 --- /dev/null +++ b/test/mjsunit/regress/regress-2931.js @@ -0,0 +1,34 @@ +// Copyright 2009 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. + +// Typed array constructors should be immune from changes to +// value of ArrayBuffer on global object. +// See http://code.google.com/p/v8/issues/detail?id=294 + +this.ArrayBuffer = function() { throw Error('BAM'); }; +var u8 = new Uint8Array(100); +assertSame(100, u8.byteLength);