clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  Fixed #71188 (str_replace converts integers in original $search array to strings)
This commit is contained in:
Xinchen Hui 2015-12-22 11:07:42 +08:00
commit b216481a96
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/standard/string.c
View File

@ -3968,12 +3968,12 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
/* For each entry in the search array, get the entry */
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(search), search_entry) {
/* Make sure we're dealing with strings. */
ZVAL_DEREF(search_entry);
convert_to_string(search_entry);
if (Z_STRLEN_P(search_entry) == 0) {
zend_string *search_str = zval_get_string(search_entry);
if (ZSTR_LEN(search_str) == 0) {
if (Z_TYPE_P(replace) == IS_ARRAY) {
replace_idx++;
}
zend_string_release(search_str);
continue;
}
@ -4003,11 +4003,11 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
}
}
if (Z_STRLEN_P(search_entry) == 1) {
if (ZSTR_LEN(search_str) == 1) {
zend_long old_replace_count = replace_count;
tmp_result = php_char_to_str_ex(Z_STR_P(result),
Z_STRVAL_P(search_entry)[0],
ZSTR_VAL(search_str)[0],
replace_value,
replace_len,
case_sensitivity,
@ -4016,10 +4016,10 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
zend_string_release(lc_subject_str);
lc_subject_str = NULL;
}
} else if (Z_STRLEN_P(search_entry) > 1) {
} else if (ZSTR_LEN(search_str) > 1) {
if (case_sensitivity) {
tmp_result = php_str_to_str_ex(Z_STR_P(result),
Z_STRVAL_P(search_entry), Z_STRLEN_P(search_entry),
ZSTR_VAL(search_str), ZSTR_LEN(search_str),
replace_value, replace_len, &replace_count);
} else {
zend_long old_replace_count = replace_count;
@ -4028,7 +4028,7 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
lc_subject_str = php_string_tolower(Z_STR_P(result));
}
tmp_result = php_str_to_str_i_ex(Z_STR_P(result), ZSTR_VAL(lc_subject_str),
Z_STR_P(search_entry), replace_value, replace_len, &replace_count);
search_str, replace_value, replace_len, &replace_count);
if (replace_count != old_replace_count) {
zend_string_release(lc_subject_str);
lc_subject_str = NULL;
@ -4036,6 +4036,8 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
}
}
zend_string_release(search_str);
if (replace_entry_str) {
zend_string_release(replace_entry_str);
replace_entry_str = NULL;
@ -4055,6 +4057,7 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *s
zend_string_release(lc_subject_str);
}
} else {
ZEND_ASSERT(Z_TYPE_P(search) == IS_STRING);
if (Z_STRLEN_P(search) == 1) {
ZVAL_STR(result,
php_char_to_str_ex(subject_str,

28
ext/standard/tests/strings/bug71188.phpt Normal file
View File

@ -0,0 +1,28 @@
--TEST--
Bug #71188 (str_replace converts integers in original $search array to strings)
--FILE--
<?php
$a = [0, 1, 2];
$b = ["Nula", "Jedna", "Dva"];
var_dump($a);
str_replace($a, $b, "1");
var_dump($a);
?>
--EXPECT--
array(3) {
[0]=>
int(0)
[1]=>
int(1)
[2]=>
int(2)
}
array(3) {
[0]=>
int(0)
[1]=>
int(1)
[2]=>
int(2)
}