Changeset 10059 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 5, 2005, 1:44:40 PM (20 years ago)

Author:

ggaren

Message:

* empty log message *

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• pcre/pcre.c (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-08-05  Geoffrey Garen  <[email protected]>
+
+        Fix by darin, reviewed by me.
+        
+        - rolled in fix for: <rdar://problem/4161606> JavaScript regular 
+        expressions with certain ranges of Unicode characters cause a crash
+
+        Test cases added:
+
+        * layout-tests/fast/js/regexp-big-unicode-ranges-expected.txt: Added.
+        * layout-tests/fast/js/regexp-big-unicode-ranges.html: Added.
+
+        * pcre/pcre.c:
+        (compile_branch): added checks for characters > 255
+
 2005-08-04  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/pcre/pcre.c

@@ -1185 +1185 @@
         goto FAILED;
         }
-
+#if PCRE_UTF16
+      if (c > 255)
+        {
+        *errorptr = ERR33;
+        goto FAILED;
+        }
+#endif
+          
       /* Handle POSIX class names. Perl allows a negation extension of the
       form [:^name]. A square bracket that doesn't match the syntax is
@@ -1321 +1328 @@
           goto FAILED;
           }
-
+#if PCRE_UTF16
+        if (d > 255)
+          {
+          *errorptr = ERR33;
+          goto FAILED;
+          }
+#endif
+        
         /* The second part of a range can be a single-character escape, but
         not any of the other escapes. Perl 5.6 treats a hyphen as a literal