cvs: php4(PHP_4_3) /ext/pcre php_pcre.c /ext/standard string.c

iliaa Sun May 25 22:00:38 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard string.c /php4/ext/pcre php_pcre.c Log: MFB Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.333.2.27 php4/ext/standard/string.c:1.333.2.28 --- php4/ext/standard/string.c:1.333.2.27 Fri May 16 19:24:55 2003 +++ php4/ext/standard/string.c Sun May 25 22:00:37 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.333.2.27 2003/05/16 23:24:55 pollita Exp $ */ +/* $Id: string.c,v 1.333.2.28 2003/05/26 02:00:37 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2728,6 +2728,7 @@ while (zend_hash_get_current_data(Z_ARRVAL_PP(subject), (void **)&subject_entry) == SUCCESS) { if (Z_TYPE_PP(subject_entry) != IS_ARRAY && Z_TYPE_PP(subject_entry) != IS_OBJECT) { MAKE_STD_ZVAL(result); + SEPARATE_ZVAL(subject_entry); php_str_replace_in_subject(*search, *replace, subject_entry, result); } else { result = *subject_entry; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.132.2.6 php4/ext/pcre/php_pcre.c:1.132.2.7 --- php4/ext/pcre/php_pcre.c:1.132.2.6 Tue May 20 14:12:07 2003 +++ php4/ext/pcre/php_pcre.c Sun May 25 22:00:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.132.2.6 2003/05/20 18:12:07 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.132.2.7 2003/05/26 02:00:37 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1085,6 +1085,7 @@ /* For each subject entry, convert it to string, then perform replacement and add the result to the return_value array. */ while (zend_hash_get_current_data(Z_ARRVAL_PP(subject), (void **)&subject_entry) == SUCCESS) { + SEPARATE_ZVAL(subject_entry); if ((result = php_replace_in_subject(*regex, *replace, subject_entry, &result_len, limit_val, is_callable_replace TSRMLS_CC)) != NULL) { /* Add to return array */ switch(zend_hash_get_current_key(Z_ARRVAL_PP(subject), &string_key, &num_key, 0))