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

Timestamp:

Aug 31, 2006, 2:28:29 PM (19 years ago)

Author:

thatcher

Message:

Reviewed by Geoff.

Band-aid fix for PCRE to compile for ppc64 and x86_64 now that
we use -Wshorten-64-to-32. Adds an INT_CAST macro that ASSERTs
the value <= INT_MAX.

I filed <rdar://problem/4712064> to track the need to verify
PCRE's 64-bit compliance.

• pcre/pcre_compile.c: (complete_callout): (compile_branch): (compile_regex): (pcre_compile2):
• pcre/pcre_exec.c: (match): (pcre_exec):
• pcre/pcre_get.c: (pcre_get_substring_list):
• pcre/pcre_internal.h:
• pcre/pcre_tables.c:
• pcre/pcre_try_flipped.c: (_pcre_try_flipped):

File:

• trunk/JavaScriptCore/pcre/pcre_compile.c (modified) (18 diffs)

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -1489 +1489 @@
 complete_callout(uschar *previous_callout, const pcre_uchar *ptr, compile_data *cd)
 {
-int length = ptr - cd->start_pattern - GET(previous_callout, 2);
+int length = INT_CAST(ptr - cd->start_pattern - GET(previous_callout, 2));
 PUT(previous_callout, 2 + LINK_SIZE, length);
 }
@@ -1846 +1846 @@
         {
         BOOL local_negate = FALSE;
-        int posix_class, i;
+        int posix_class, i, namelen;
         register const uschar *cbits = cd->cbits;
 
@@ -1862 +1862 @@
           }
 
-        posix_class = check_posix_name(ptr, tempptr - ptr);
+        namelen = INT_CAST(tempptr - ptr);
+        posix_class = check_posix_name(ptr, namelen);
         if (posix_class < 0)
           {
@@ -2276 +2277 @@
       else
         {
-        int len = class_utf8data - (code + 33);
+        int len = INT_CAST(class_utf8data - (code + 33));
         memmove(code + 1, code + 33, len);
         code += len + 1;
@@ -2405 +2406 @@
         uschar *lastchar = code - 1;
         while((*lastchar & 0xc0) == 0x80) lastchar--;
-        c = code - lastchar;            /* Length of UTF-8 character */
+        c = INT_CAST(code - lastchar);            /* Length of UTF-8 character */
         memcpy(utf8_char, lastchar, c); /* Save the char */
         c |= 0x80;                      /* Flag c as a length */
@@ -2618 +2619 @@
       register int i;
       int ketoffset = 0;
-      int len = code - previous;
+      int len = INT_CAST(code - previous);
       uschar *bralink = NULL;
 
@@ -2631 +2632 @@
         register uschar *ket = previous;
         do ket += GET(ket, 1); while (*ket != OP_KET);
-        ketoffset = code - ket;
+        ketoffset = INT_CAST(code - ket);
         }
 
@@ -2677 +2678 @@
         else
           {
-          int offset;
+          int offset, tmpoffset;
           *code = OP_END;
           adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd);
@@ -2688 +2689 @@
           filled in later when the ends of the brackets are reached. */
 
-          offset = (bralink == NULL)? 0 : previous - bralink;
+          tmpoffset = INT_CAST(previous - bralink);
+          offset = (bralink == NULL)? 0 : tmpoffset;
           bralink = previous;
           PUTINC(previous, 0, offset);
@@ -2732 +2734 @@
           if (i != 0)
             {
-            int offset;
+            int offset, tmpoffset;
             *code++ = OP_BRA;
-            offset = (bralink == NULL)? 0 : code - bralink;
+            tmpoffset = INT_CAST(code - bralink);
+            offset = (bralink == NULL)? 0 : tmpoffset;
             bralink = code;
             PUTINC(code, 0, offset);
@@ -2749 +2752 @@
           {
           int oldlinkoffset;
-          int offset = code - bralink + 1;
+          int offset = INT_CAST(code - bralink + 1);
           uschar *bra = code - offset;
           oldlinkoffset = GET(bra, 1);
@@ -2783 +2786 @@
     if (possessive_quantifier)
       {
-      int len = code - tempcode;
+      int len = INT_CAST(code - tempcode);
       memmove(tempcode + 1+LINK_SIZE, tempcode, len);
       code += 1 + LINK_SIZE;
@@ -2931 +2934 @@
 
           while (*ptr++ != '>');
-          namelen = ptr - name - 1;
+          namelen = INT_CAST(ptr - name - 1);
 
           /* FIXME: This won't work for UTF-16. */
@@ -2970 +2973 @@
 
           while (*ptr != ')') ptr++;
-          namelen = ptr - name;
+          namelen = INT_CAST(ptr - name);
 
           for (i = 0; i < cd->names_found; i++)
@@ -3587 +3590 @@
   if (*ptr != '|')
     {
-    int length = code - last_branch;
+    int length = INT_CAST(code - last_branch);
     do
       {
@@ -4580 +4583 @@
             }
           name_count++;
-          if (ptr - p > max_name_size) max_name_size = (ptr - p);
+          if (ptr - p > max_name_size) max_name_size = INT_CAST(ptr - p);
           break;
           }
@@ -4955 +4958 @@
 4-byte pointers is run on another with 8-byte pointers. */
 
-re->magic_number = MAGIC_NUMBER;
-re->size = size;
+re->magic_number = (pcre_uint32)MAGIC_NUMBER;
+re->size = (pcre_uint32)size;
 re->options = options;
 re->dummy1 = 0;
@@ -5017 +5020 @@
   (pcre_free)(re);
   PCRE_ERROR_RETURN:
-  *erroroffset = ptr - (const pcre_uchar *)pattern;
+  *erroroffset = INT_CAST(ptr - (const pcre_uchar *)pattern);
   PCRE_EARLY_ERROR_RETURN:
   *errorptr = error_texts[errorcode];