Changeset 16155 in webkit for trunk/JavaScriptCore/pcre/pcre_get.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_get.c (modified) (1 diff)

trunk/JavaScriptCore/pcre/pcre_get.c

@@ -209 +209 @@
 {
 int i;
-int size = sizeof(char *);
+int size = (int)sizeof(char *);
 int double_count = stringcount * 2;
 pcre_char **stringlist;
 pcre_char *p;
 
-for (i = 0; i < double_count; i += 2)
-  size += sizeof(pcre_char *) + (ovector[i+1] - ovector[i] + 1) * sizeof(pcre_char);
+for (i = 0; i < double_count; i += 2) {
+  size += INT_CAST(sizeof(pcre_char *) + (ovector[i+1] - ovector[i] + 1) * sizeof(pcre_char));
+}
 
 stringlist = (pcre_char **)(pcre_malloc)(size);