[webkit-changes] cvs commit: JavaScriptCore/pcre pcre.c

[Adele]

adele       05/08/08 18:14:04

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               pcre     Tag: Safari-2-0-branch pcre.c
  Log:
           Merged fix from TOT to Safari-2-0-branch
  
   2005-08-05  Geoffrey Garen  <ggaren at apple.com>
  
           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
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.677.6.22 +19 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.6.21
  retrieving revision 1.677.6.22
  diff -u -r1.677.6.21 -r1.677.6.22
  --- ChangeLog	9 Aug 2005 00:29:22 -0000	1.677.6.21
  +++ ChangeLog	9 Aug 2005 01:14:02 -0000	1.677.6.22
  @@ -1,5 +1,24 @@
   2005-08-08  Adele Peterson  <adele at apple.com>
   
  +         Merged fix from TOT to Safari-2-0-branch
  +
  + 2005-08-05  Geoffrey Garen  <ggaren at apple.com>
  + 
  +         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-08  Adele Peterson  <adele at apple.com>
  +
             Merged fix from TOT to Safari-2-0-branch
             <rdar://problem/3444900> some US-centric date formats not parsed by JavaScript (clock at news8austin.com) (bugzilla 3477)
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.12.2  +16 -2     JavaScriptCore/pcre/pcre.c
  
  Index: pcre.c
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/pcre/pcre.c,v
  retrieving revision 1.3.12.1
  retrieving revision 1.3.12.2
  diff -u -r1.3.12.1 -r1.3.12.2
  --- pcre.c	12 Jul 2005 16:24:54 -0000	1.3.12.1
  +++ pcre.c	9 Aug 2005 01:14:03 -0000	1.3.12.2
  @@ -1184,7 +1184,14 @@
           *errorptr = ERR6;
           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
         treated as a literal. We also recognize the POSIX constructions
  @@ -1320,7 +1327,14 @@
             *errorptr = ERR6;
             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
           in such circumstances. */