Changeset 39963 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.cpp

Timestamp:

Jan 16, 2009, 12:01:44 AM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-01-15 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Fixed <rdar://problem/6471394> REGRESSION (r39164): Discarding quantifier
on assertion gives incorrect result (23075)

​https://bugs.webkit.org/show_bug.cgi?id=23075

• pcre/pcre_compile.cpp: (compileBranch): Throw away an assertion if it's followed by a quantifier with a 0 minimum, to match SpiderMonkey, v8, and the ECMA spec.

• wrec/WRECParser.cpp: (JSC::WREC::Parser::parseParentheses): Fall back on PCRE for the rare case of an assertion with a quantifier with a 0 minimum, since we don't handle quantified subexpressions yet, and in this special case, we can't just throw away the quantifier.

LayoutTests:

2009-01-15 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Added a test for <rdar://problem/6471394> REGRESSION (r39164): Discarding
quantifier on assertion gives incorrect result (23075)

• fast/regex/quantified-assertions-expected.txt:
• fast/regex/resources/quantified-assertions.js:

File:

• trunk/JavaScriptCore/pcre/pcre_compile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -1059 +1059 @@
                 reqvary = (repeatMin == repeat_max) ? 0 : REQ_VARY;
                 
-                // A quantifier after an assertion is meaningless, since assertions
-                // don't move index forward. So, we discard it.
-                if (*previous == OP_ASSERT || *previous == OP_ASSERT_NOT)
-                    goto END_REPEAT;
-                
                 opType = 0;                    /* Default single-char op codes */
                 
@@ -1415 +1410 @@
                     else
                         code[-ketoffset] = OP_KETRMAX + repeatType;
+                }
+                
+                // A quantifier after an assertion is mostly meaningless, but it
+                // can nullify the assertion if it has a 0 minimum.
+                else if (*previous == OP_ASSERT || *previous == OP_ASSERT_NOT) {
+                    if (repeatMin == 0) {
+                        code = previous;
+                        goto END_REPEAT;
+                    }
                 }