iliaa Wed Jan 28 16:47:37 2004 EDT
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
Fixed bug #27011 (64bit int/long confusion in preg_match*() functions).
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.151&r2=1.152&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.151 php-src/ext/pcre/php_pcre.c:1.152
--- php-src/ext/pcre/php_pcre.c:1.151 Thu Jan 15 21:29:49 2004
+++ php-src/ext/pcre/php_pcre.c Wed Jan 28 16:47:36 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.151 2004/01/16 02:29:49 iliaa Exp $ */
+/* $Id: php_pcre.c,v 1.152 2004/01/28 21:47:36 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -346,7 +346,7 @@
int regex_len;
int subject_len;
zval *subpats = NULL; /* Array for subpatterns */
- int flags; /* Match
control flags */
+ long flags; /* Match
control flags */
zval *result_set, /* Holds a set of subpatterns
after
a
global match */
@@ -360,7 +360,7 @@
int *offsets; /* Array of
subpattern offsets */
int num_subpats; /* Number of captured
subpatterns */
int size_offsets; /* Size of the offsets
array */
- int start_offset = 0; /* Where the new
search starts */
+ long start_offset = 0; /* Where the new
search starts */
int matched; /* Has
anything matched */
int subpats_order = 0; /* Order of subpattern
matches */
int offset_capture = 0;/* Capture match offsets:
yes/no */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
