Allow replacement to be any scalar value

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 860cccee4d77276cafb147aba09e9aa211d9e885..21755c7ea44e96a7635250bd1fee8bc14b183d68 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1975,7 +1975,7 @@ SPL_METHOD(RegexIterator, accept)
        spl_dual_it_object *intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
        char       *subject, tmp[32], *result;
        int        subject_len, use_copy, count = 0, result_len;
-       zval       subject_copy, zcount, *replacement;
+       zval       subject_copy, zcount, *replacement, tmp_replacement;
        
        if (zend_parse_parameters_none() == FAILURE) {
                return;
@@ -2042,6 +2042,12 @@ SPL_METHOD(RegexIterator, accept)
 
        case REGIT_MODE_REPLACE:
                replacement = zend_read_property(intern->std.ce, getThis(), "replacement", sizeof("replacement")-1, 1 TSRMLS_CC);
+               if (Z_TYPE_P(replacement) != IS_STRING) {
+                       tmp_replacement = *replacement;
+                       zval_copy_ctor(&tmp_replacement);
+                       convert_to_string(&tmp_replacement);
+                       replacement = &tmp_replacement;
+               }
                result = php_pcre_replace_impl(intern->u.regex.pce, subject, subject_len, replacement, 0, &result_len, -1, &count TSRMLS_CC);
                
                if (intern->u.regex.flags & REGIT_USE_KEY) {
@@ -2056,6 +2062,10 @@ SPL_METHOD(RegexIterator, accept)
                        MAKE_STD_ZVAL(intern->current.data);
                        ZVAL_STRINGL(intern->current.data, result, result_len, 0);
                }
+
+               if (replacement == &tmp_replacement) {
+                       zval_dtor(replacement);
+               }
                RETVAL_BOOL(count > 0);
        }