diff --git a/src/d8.cc b/src/d8.cc index 8233f861ea..83e2fc50d5 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -532,8 +532,9 @@ Handle Shell::CreateExternalArray(const Arguments& args, if (args[0]->IsObject() && args[0]->ToObject()->Has(Symbols::length(isolate))) { // Construct from array. - length = convertToUint( - args[0]->ToObject()->Get(Symbols::length(isolate)), &try_catch); + Local value = args[0]->ToObject()->Get(Symbols::length(isolate)); + if (try_catch.HasCaught()) return try_catch.ReThrow(); + length = convertToUint(value, &try_catch); if (try_catch.HasCaught()) return try_catch.ReThrow(); init_from_array = true; } else { diff --git a/test/mjsunit/regress/regress-crbug-168545.js b/test/mjsunit/regress/regress-crbug-168545.js new file mode 100644 index 0000000000..1bc52fe9b0 --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-168545.js @@ -0,0 +1,30 @@ +// 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. + +var o = {}; +Object.defineProperty(o, "length", { get: function() { throw "bail"; }}); +assertThrows("new Int16Array(o);");