Changeset 24430 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.c

Timestamp:

Jul 18, 2007, 5:44:16 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Oliver Hunt.

• fix <rdar://problem/5345432> PCRE computes length wrong for expressions such as "[]"

Test: fast/js/regexp-charclass-crash.html

• pcre/pcre_compile.c: (pcre_compile2): Fix the preflight code that calls check_posix_syntax to match the actual regular expression compilation code; before it was missing the check of the first character.

LayoutTests:

Reviewed by Oliver Hunt.

• test for <rdar://problem/5345432> PCRE computes length wrong for expressions such as "[]"

• fast/js/regexp-charclass-crash-expected.txt: Added.
• fast/js/regexp-charclass-crash.html: Added.

File:

• trunk/JavaScriptCore/pcre/pcre_compile.c (modified) (1 diff)

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -4325 +4325 @@
       checked during the real compile phase. */
 
-      else if (*ptr == '[' && ptr + 2 < patternEnd && check_posix_syntax(ptr, patternEnd, &ptr, &compile_block))
+      else if (*ptr == '[' && ptr + 2 < patternEnd && (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') && check_posix_syntax(ptr, patternEnd, &ptr, &compile_block))
         {
         ptr++;