Reviewers: Jakob,
Description:
Correctly check length when allocating string.
[email protected]
BUG=
TEST=regress-regexp-overflow.js
Please review this at https://chromiumcodereview.appspot.com/10538012/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/runtime.cc
A test/mjsunit/regress/regress-regexp-overflow.js
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
cf143127acade800d3cf13e9354bc581f1ba2ce0..f993f0447bd57dc181a646e0c9deddf4bc28bbad
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -2985,7 +2985,14 @@ MUST_USE_RESULT static MaybeObject*
StringReplaceAtomRegExpWithString(
int matches = indices.length();
if (matches == 0) return *subject;
- int result_len = (replacement_len - pattern_len) * matches + subject_len;
+ // Detect integer overflow.
+ int64_t result_len =
+ (static_cast<int64_t>(replacement_len) -
+ static_cast<int64_t>(pattern_len)) *
+ static_cast<int64_t>(matches) +
+ static_cast<int64_t>(subject_len);
+ if (result_len > INT_MAX) return Failure::OutOfMemoryException();
+
int subject_pos = 0;
int result_pos = 0;
Index: test/mjsunit/regress/regress-regexp-overflow.js
diff --git a/test/mjsunit/regress/regress-regexp-overflow.js
b/test/mjsunit/regress/regress-regexp-overflow.js
new file mode 100644
index
0000000000000000000000000000000000000000..ba00952ce763ff06c39f153d9349129a5a97b91c
--- /dev/null
+++ b/test/mjsunit/regress/regress-regexp-overflow.js
@@ -0,0 +1,35 @@
+// Copyright 2012 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.
+
+// Result string has the length 2^32, causing an integer overflow.
+
+var a = "a";
+for (var i = 0; i < 16; i++) {
+ a += a;
+}
+
+a.replace(/a/g, a);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
