cvs: php4 /ext/standard string.c

moriyoshi Fri Feb 14 13:59:51 2003 EDT Modified files: /php4/ext/standard string.c Log: Fixed a str_replace() bug similar to bug #22224 Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.357 php4/ext/standard/string.c:1.358 --- php4/ext/standard/string.c:1.357 Fri Feb 14 13:42:36 2003 +++ php4/ext/standard/string.c Fri Feb 14 13:59:50 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.357 2003/02/14 18:42:36 moriyoshi Exp $ */ +/* $Id: string.c,v 1.358 2003/02/14 18:59:50 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2865,7 +2865,8 @@ /* 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;