[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c branches/PHP_5_4/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c

[Hannes Magnusson]

bjori                                    Mon, 12 Sep 2011 11:44:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316528

Log:
Ensure we are working with strings here

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
    U   php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
    U   php/php-src/trunk/ext/pcre/php_pcre.c

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c    2011-09-12 10:57:26 UTC 
(rev 316527)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c    2011-09-12 11:44:55 UTC 
(rev 316528)
@@ -1013,6 +1013,7 @@
                        return NULL;
                }
        } else {
+               convert_to_string_ex(&replace_val);
                replace = Z_STRVAL_P(replace_val);
                replace_len = Z_STRLEN_P(replace_val);
                replace_end = replace + replace_len;

Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c    2011-09-12 10:57:26 UTC 
(rev 316527)
+++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c    2011-09-12 11:44:55 UTC 
(rev 316528)
@@ -1013,6 +1013,7 @@
                        return NULL;
                }
        } else {
+               convert_to_string_ex(&replace_val);
                replace = Z_STRVAL_P(replace_val);
                replace_len = Z_STRLEN_P(replace_val);
                replace_end = replace + replace_len;

Modified: php/php-src/trunk/ext/pcre/php_pcre.c
===================================================================
--- php/php-src/trunk/ext/pcre/php_pcre.c       2011-09-12 10:57:26 UTC (rev 
316527)
+++ php/php-src/trunk/ext/pcre/php_pcre.c       2011-09-12 11:44:55 UTC (rev 
316528)
@@ -1013,6 +1013,7 @@
                        return NULL;
                }
        } else {
+               convert_to_string_ex(&replace_val);
                replace = Z_STRVAL_P(replace_val);
                replace_len = Z_STRLEN_P(replace_val);
                replace_end = replace + replace_len;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php