From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 14 Feb 2003 19:00:43 +0000 (+0000)
Subject: MFH(r1.358): Fixed a str_replace() bug similar to bug #22224
X-Git-Tag: php-4.3.2RC1~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d47746e5a96d97303891b4dc664e7acdbf00e8f;p=php

MFH(r1.358): Fixed a str_replace() bug similar to bug #22224
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 970114a49a..75d773a32a 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2621,7 +2621,8 @@ static void php_str_replace_in_subject(zval *search, zval *replace, zval **subje
 		/* For each entry in the search array, get the entry */
 		while (zend_hash_get_current_data(Z_ARRVAL_P(search), (void **) &search_entry) == SUCCESS) {
 			/* Make sure we're dealing with strings. */	
-			convert_to_string_ex(search_entry);
+			SEPARATE_ZVAL(search_entry);
+			convert_to_string(*search_entry);
 			if (Z_STRLEN_PP(search_entry) == 0) {
 				zend_hash_move_forward(Z_ARRVAL_P(search));
 				continue;