Reviewers: Rico,
Message:
PTAL.
Description:
Fix crash in d8 when external array ctor hits stack overflow
BUG=100859
TEST=mjsunit/regress/regress-crbug-100859
Please review this at http://codereview.chromium.org/8898021/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/d8.cc
A test/mjsunit/regress/regress-crbug-100859.js
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index
9eccc7e4fe4ed6fd0786c0bbeb62a06ffb277498..cc91daa692f1cd00e17af640468915f45eeb74a5
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -301,10 +301,26 @@ Handle<Value> Shell::CreateExternalArray(const
Arguments& args,
} else {
Local<Number> number = args[0]->ToNumber();
if (number.IsEmpty() || !number->IsNumber()) {
+ i::Isolate* isolate = i::Isolate::Current();
+ if (isolate->try_catch_handler()->HasCaught()) {
+ return isolate->try_catch_handler()->Exception();
+ }
return ThrowException(String::New("Array length must be a number."));
}
- int32_t raw_length = number->ToInt32()->Int32Value();
+ Local<Int32> int32 = number->ToInt32();
+ if (int32.IsEmpty()) {
+ i::Isolate* isolate = i::Isolate::Current();
+ if (isolate->try_catch_handler()->HasCaught()) {
+ return isolate->try_catch_handler()->Exception();
+ }
+ return ThrowException(String::New("Array length must be a number."));
+ }
+ int32_t raw_length = int32->Int32Value();
if (raw_length < 0) {
+ i::Isolate* isolate = i::Isolate::Current();
+ if (isolate->try_catch_handler()->HasCaught()) {
+ return isolate->try_catch_handler()->Exception();
+ }
return ThrowException(String::New("Array length must not be
negative."));
}
if (raw_length > static_cast<int32_t>(kMaxLength)) {
Index: test/mjsunit/regress/regress-crbug-100859.js
diff --git a/test/mjsunit/regress/regress-crbug-100859.js
b/test/mjsunit/regress/regress-crbug-100859.js
new file mode 100644
index
0000000000000000000000000000000000000000..1471723d73da11cd6bb883795c85c2b487622bad
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-100859.js
@@ -0,0 +1,56 @@
+// Copyright 2011 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.
+
+// This used to trigger a crash where it should simply have complained that
+// the array length must be a number.
+function setx() {
+ setx(typeof new Uint16Array('x') === 'object');
+}
+exception = false;
+try {
+ setx();
+ assertUnreachable();
+} catch (ex) {
+ assertTrue(typeof(ex) == 'string');
+ exception = true;
+}
+assertTrue(exception);
+
+// This used to trigger a crash because of an unhandled stack overflow.
+function sety() {
+ sety(typeof new Uint16Array(1) === 'object');
+}
+
+var exception = false;
+try {
+ sety();
+ assertUnreachable();
+} catch (ex) {
+ assertTrue(ex instanceof RangeError);
+ exception = true;
+}
+assertTrue(exception);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
