Reviewers: Erik Corry, Message: You bugged it, you review it.
Description: 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. Please review this at http://codereview.chromium.org/113575 Affected files: M src/runtime.cc A test/mjsunit/regress/regress-349.js Index: src/runtime.cc diff --git a/src/runtime.cc b/src/runtime.cc index ca0c67bfe05554ba9957da3b4a892ae2ca67cfd3..99ba3f11fd29d774bf6c609e22c79e97bc4eb54e 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -2035,7 +2035,7 @@ static int BoyerMooreIndexOf(Vector<const schar> 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<const schar> subject, } idx += shift; } - } while (idx <= n - m); + } return -1; } Index: test/mjsunit/regress/regress-349.js diff --git a/test/mjsunit/regress/regress-349.js b/test/mjsunit/regress/regress-349.js new file mode 100644 index 0000000000000000000000000000000000000000..1a60e3e127f2e9cd12dc8ce057756382dcf64d1f --- /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")); --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
