Changeset 18517 in webkit for trunk/JavaScriptCore/kjs/regexp.cpp

Timestamp:

Jan 1, 2007, 9:13:00 PM (18 years ago)

Author:

ddkilzer

Message:

JavaScriptCore:

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=11849 REGRESSION (r18182): Google Calendar is broken (a regular expression containing a null character is not parsed correctly)

Modified pcre_compile() (and the functions that it calls) to work with patterns
containing null characters.

Covered by JavaScriptCore tests ecma_3/RegExp/octal-002.js and ecma_3/RegExp/regress-85721.js

• kjs/regexp.cpp: (KJS::RegExp::RegExp): Changed to not null-terminate the pattern string and instead pass its length to pcre_compile.
• pcre/pcre.h:
• pcre/pcre_compile.c: (check_escape): (get_ucp): (is_counted_repeat): (check_posix_syntax): (compile_branch): (compile_regex): (pcre_compile): Added a parameter specifying the length of the pattern, which is no longer required to be null-terminated and may contain null characters. (pcre_compile2):
• pcre/pcre_internal.h:
• tests/mozilla/expected.html: Updated for the two tests that this patch fixes. Also updated failing results for ecma_3/RegExp/regress-100199.js which were not updated after bug 6257 was fixed.

WebCore:

Reviewed by Darin.

• WebCore changes for ​http://bugs.webkit.org/show_bug.cgi?id=11849 REGRESSION (r18182): Google Calendar is broken (a regular expression containing a null character is not parsed correctly)

• platform/RegularExpression.cpp: (WebCore::RegularExpression::Private::compile): Changed to not null-terminate the pattern string and instead pass its length to pcre_compile.

File:

• trunk/JavaScriptCore/kjs/regexp.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -48 +48 @@
   int errorOffset;
   
-  UString pattern(p);
-  
-  pattern.append('\0');
-  m_regex = pcre_compile(reinterpret_cast<const uint16_t*>(pattern.data()),
+  m_regex = pcre_compile(reinterpret_cast<const uint16_t*>(p.data()), p.size(),
                         options, &errorMessage, &errorOffset, NULL);
   if (!m_regex) {
     // Try again, this time handle any \u we might find.
-    UString uPattern = sanitizePattern(pattern);
-    m_regex = pcre_compile(reinterpret_cast<const uint16_t*>(uPattern.data()),
+    UString uPattern = sanitizePattern(p);
+    m_regex = pcre_compile(reinterpret_cast<const uint16_t*>(uPattern.data()), uPattern.size(),
                           options, &errorMessage, &errorOffset, NULL);
     if (!m_regex) {