diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-29 20:09:00 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-29 20:09:00 (GMT) |
| commit | 73595a315989581e2f59b28af5d150d39ea6b8ff (patch) | |
| tree | ce06fcf2f8e773bcdb1b1394e4f1ab0e15831b33 /src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | |
| parent | 12e5d8897fbd60def1dd38608c1cd3f0d1d4317b (diff) | |
| download | Qt-73595a315989581e2f59b28af5d150d39ea6b8ff.zip Qt-73595a315989581e2f59b28af5d150d39ea6b8ff.tar.gz Qt-73595a315989581e2f59b28af5d150d39ea6b8ff.tar.bz2 | |
Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992
Backported various crash fixes
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp index c2cb1c2..647b20a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp @@ -1554,7 +1554,7 @@ public: } case PatternTerm::TypeParentheticalAssertion: { - unsigned alternativeFrameLocation = term.inputPosition + RegexStackSpaceForBackTrackInfoParentheticalAssertion; + unsigned alternativeFrameLocation = term.frameLocation + RegexStackSpaceForBackTrackInfoParentheticalAssertion; atomParentheticalAssertionBegin(term.parentheses.subpatternId, term.invertOrCapture, term.frameLocation, alternativeFrameLocation); emitDisjunction(term.parentheses.disjunction, currentCountAlreadyChecked, 0); |