Changeset 16155 in webkit for trunk/JavaScriptCore/pcre/pcre_exec.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_exec.c (modified) (10 diffs)

trunk/JavaScriptCore/pcre/pcre_exec.c

@@ -591 +591 @@
 
       DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
-      md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
+      md->offset_vector[md->offset_end - number] = INT_CAST(eptr - md->start_subject);
 
       do
@@ -810 +810 @@
       cb.offset_vector    = md->offset_vector;
       cb.subject          = (const pcre_char *)md->start_subject;
-      cb.subject_length   = md->end_subject - md->start_subject;
-      cb.start_match      = md->start_match - md->start_subject;
-      cb.current_position = eptr - md->start_subject;
+      cb.subject_length   = INT_CAST(md->end_subject - md->start_subject);
+      cb.start_match      = INT_CAST(md->start_match - md->start_subject);
+      cb.current_position = INT_CAST(eptr - md->start_subject);
       cb.pattern_position = GET(ecode, 2);
       cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
@@ -1077 +1077 @@
             md->offset_vector[offset] =
               md->offset_vector[md->offset_end - number];
-            md->offset_vector[offset+1] = eptr - md->start_subject;
+            md->offset_vector[offset+1] = INT_CAST(eptr - md->start_subject);
             if (offset_top <= offset) offset_top = offset + 2;
             }
@@ -1419 +1419 @@
     case OP_REF:
       {
+      int tmplen;
       offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
       ecode += 3;                                 /* Advance past item */
@@ -1427 +1428 @@
       minima. */
 
+      tmplen = INT_CAST(md->end_subject - eptr + 1);
       length = (offset >= offset_top || md->offset_vector[offset] < 0)?
-        md->end_subject - eptr + 1 :
+        tmplen :
         md->offset_vector[offset+1] - md->offset_vector[offset];
 
@@ -3070 +3072 @@
               {
               c = max - min;
-              if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+              if (c > md->end_subject - eptr) c = INT_CAST(md->end_subject - eptr);
               eptr += c;
               }
@@ -3080 +3082 @@
           case OP_ANYBYTE:
           c = max - min;
-          if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+          if (c > md->end_subject - eptr) c = INT_CAST(md->end_subject - eptr);
           eptr += c;
           break;
@@ -3185 +3187 @@
           case OP_ANYBYTE:
           c = max - min;
-          if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+          if (c > md->end_subject - eptr) c = INT_CAST(md->end_subject - eptr);
           eptr += c;
           break;
@@ -3414 +3416 @@
 if (extra_data != NULL)
   {
-  register unsigned int flags = extra_data->flags;
+  register unsigned long flags = extra_data->flags;
   if ((flags & PCRE_EXTRA_STUDY_DATA) != 0)
     study = (const pcre_study_data *)extra_data->study_data;
@@ -3773 +3775 @@
   if (offsetcount < 2) rc = 0; else
     {
-    offsets[0] = start_match - match_block.start_subject;
-    offsets[1] = match_block.end_match_ptr - match_block.start_subject;
+    offsets[0] = INT_CAST(start_match - match_block.start_subject);
+    offsets[1] = INT_CAST(match_block.end_match_ptr - match_block.start_subject);
     }