From 2ff3901cf7ed6f0eaecd243b3e295f054690700b Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Tue, 19 May 2009 09:01:03 +0000 Subject: [PATCH] Fix for issue 349: Make initial boundary check for BM text search. There was a case where the BMH algorithm bailed out exactly at the end of the string, and the BM algorithm that takes over wasn't expecting this. Review URL: http://codereview.chromium.org/113575 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1995 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/runtime.cc | 4 ++-- test/mjsunit/regress/regress-349.js | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/regress/regress-349.js diff --git a/src/runtime.cc b/src/runtime.cc index ca0c67b..99ba3f1 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -2035,7 +2035,7 @@ static int BoyerMooreIndexOf(Vector subject, BoyerMoorePopulateGoodSuffixTable(pattern, start); pchar last_char = pattern[m - 1]; // Continue search from i. - do { + while (idx <= n - m) { int j = m - 1; schar c; while (last_char != (c = subject[idx + j])) { @@ -2061,7 +2061,7 @@ static int BoyerMooreIndexOf(Vector subject, } idx += shift; } - } while (idx <= n - m); + } return -1; } diff --git a/test/mjsunit/regress/regress-349.js b/test/mjsunit/regress/regress-349.js new file mode 100644 index 0000000..1a60e3e --- /dev/null +++ b/test/mjsunit/regress/regress-349.js @@ -0,0 +1,32 @@ +// 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. + +// Should not crash. +// See http://code.google.com/p/v8/issues/detail?id=349 + +var str = "bbaabbbbbbbbabbaaaabbaaabbbaaaabbaaabbabaaabb"; +assertEquals(str, str.replace(/aabab/g, "foo")); -- 2.7.4