source: webkit/trunk/JavaScriptCore/wrec/WREC.cpp@ 38929

Last change on this file since 38929 was 38929, checked in by [email protected], 16 years ago

JavaScriptCore:

2008-12-02 Geoffrey Garen <[email protected]>

Reviewed by Cameron Zwarich.


Fixed https://bugs.webkit.org/show_bug.cgi?id=22537
REGRESSION (r38745): Assertion failure in jsSubstring() at ge.com

The bug was that index would become greater than length, so our
"end of input" checks, which all check "index == length", would fail.


The solution is to check for end of input before incrementing index,
to ensure that index is always <= length.


As a side benefit, generateJumpIfEndOfInput can now use je instead of
jg, which should be slightly faster.

  • wrec/WREC.cpp: (JSC::WREC::Generator::compileRegExp):
  • wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateJumpIfEndOfInput):

LayoutTests:

2008-12-02 Geoffrey Garen <[email protected]>

Reviewed by Cameron Zwarich.


Test for https://bugs.webkit.org/show_bug.cgi?id=22537
REGRESSION (r38745): Assertion failure in jsSubstring() at ge.com

  • fast/regex/alternative-length-miscalculation-expected.txt: Added.
  • fast/regex/alternative-length-miscalculation.html: Added.
File size: 2.9 KB
Line 
1/*
2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include "config.h"
27#include "WREC.h"
28
29#if ENABLE(WREC)
30
31#include "CharacterClassConstructor.h"
32#include "Interpreter.h"
33#include "WRECFunctors.h"
34#include "WRECParser.h"
35#include "pcre_internal.h"
36
37using namespace WTF;
38
39namespace JSC { namespace WREC {
40
41// This limit comes from the limit set in PCRE
42static const int MaxPatternSize = (1 << 16);
43
44CompiledRegExp Generator::compileRegExp(Interpreter* interpreter, const UString& pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
45{
46 if (pattern.size() > MaxPatternSize) {
47 *error_ptr = "Regular expression too large.";
48 return 0;
49 }
50
51 Parser parser(pattern, ignoreCase, multiline, interpreter->assemblerBuffer());
52 Generator& generator = parser.generator();
53 MacroAssembler::JumpList failures;
54
55 generator.generateEnter();
56 generator.generateSaveIndex();
57
58 Label beginPattern(&generator);
59 parser.parsePattern(failures);
60 generator.generateReturnSuccess();
61
62 failures.link();
63 generator.generateJumpIfEndOfInput(failures);
64 generator.generateIncrementIndex();
65 parser.parsePattern(failures);
66 generator.generateReturnSuccess();
67
68 failures.link();
69 generator.generateIncrementIndex();
70 generator.generateJumpIfNotEndOfInput(beginPattern);
71 generator.generateReturnFailure();
72
73 if (parser.error()) {
74 *error_ptr = "Regular expression malformed.";
75 return 0;
76 }
77
78 *numSubpatterns_ptr = parser.numSubpatterns();
79 return reinterpret_cast<CompiledRegExp>(generator.copyCode());
80}
81
82} } // namespace JSC::WREC
83
84#endif // ENABLE(WREC)
Note: See TracBrowser for help on using the repository browser.