archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #75902

Browse source 
Don't special-case nested arrays/objects in str_replace(), instead
perform a string cast on them as well. For arrays, this will always
result in the usual conversion warning.

This behavior is consistent with preg_replace(). If we didn't want
to cast the array to string here, we should instead perform the
replacement recursively. Silently copying it is just confusing.
This commit is contained in:
Nikita Popov 2020-03-10 16:49:17 +01:00
parent d9219f997d
commit e8678fcb42
5 changed files with 59 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -119,6 +119,8 @@ PHP NEWS
filter). (kkopachev)
. Fixed bug #78385 (parse_url() does not include 'query' when question mark
is the last char). (Islam Israfilov)
. Fixed bug #75902 (str_replace should warn when misused with nested arrays).
(Nikita)
. Made quoting of cmd execution functions consistent. (cmb)
- tidy:

13
ext/standard/string.c
View file

@ -4326,15 +4326,12 @@ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensit
/* For each subject entry, convert it to string, then perform replacement
and add the result to the return_value array. */
ZEND_HASH_FOREACH_KEY_VAL(subject_ht, num_key, string_key, subject_entry) {
zend_string *tmp_subject_str;
ZVAL_DEREF(subject_entry);
if (Z_TYPE_P(subject_entry) != IS_ARRAY && Z_TYPE_P(subject_entry) != IS_OBJECT) {
zend_string *tmp_subject_str;
subject_str = zval_get_tmp_string(subject_entry, &tmp_subject_str);
count += php_str_replace_in_subject(search, replace, subject_str, &result, case_sensitivity);
zend_tmp_string_release(tmp_subject_str);
} else {
ZVAL_COPY(&result, subject_entry);
}
subject_str = zval_get_tmp_string(subject_entry, &tmp_subject_str);
count += php_str_replace_in_subject(search, replace, subject_str, &result, case_sensitivity);
zend_tmp_string_release(tmp_subject_str);
/* Add to return array */
if (string_key) {
zend_hash_add_new(Z_ARRVAL_P(return_value), string_key, &result);

17
ext/standard/tests/strings/bug25671.phpt
View file

@ -15,8 +15,15 @@ Bug #25671 (subarrays not copied correctly)
echo serialize(str_replace(" ", "", $arr)) . "\n";
echo serialize(str_replace(" ", "", $arr)) . "\n";
?>
--EXPECT--
a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:22:"This is a last strung.";}
a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:22:"This is a last strung.";}
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";}
--EXPECTF--
Warning: Array to string conversion in %s on line %d
a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;s:5:"Array";i:3;s:22:"This is a last strung.";}
Warning: Array to string conversion in %s on line %d
a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;s:5:"Array";i:3;s:22:"This is a last strung.";}
Warning: Array to string conversion in %s on line %d
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;s:5:"Array";i:3;s:18:"Thisisalaststring.";}
Warning: Array to string conversion in %s on line %d
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;s:5:"Array";i:3;s:18:"Thisisalaststring.";}

13
ext/standard/tests/strings/bug71969.phpt
View file

@ -13,16 +13,9 @@ foreach($a as &$record)
}
var_dump(str_replace("2", "3", $a));
?>
--EXPECT--
--EXPECTF--
Warning: Array to string conversion in %s on line %d
array(1) {
[0]=>
array(1) {
["one"]=>
array(2) {
["a"]=>
string(4) "2222"
["b"]=>
string(4) "1111"
}
}
string(5) "Array"
}

62
ext/standard/tests/strings/str_replace_variation1.phpt
View file

@ -27,9 +27,11 @@ foreach( $search_arr as $value ) {
}
?>
--EXPECT--
--EXPECTF--
*** Testing str_replace() with various search values ***
-- Iteration 0 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(5) "FOUND"
@ -50,8 +52,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -60,6 +61,8 @@ array(12) {
int(5)
-- Iteration 1 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -80,8 +83,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -90,6 +92,8 @@ array(12) {
int(0)
-- Iteration 2 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(5) "FOUND"
@ -110,8 +114,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -120,6 +123,8 @@ array(12) {
int(5)
-- Iteration 3 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -140,8 +145,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -150,6 +154,8 @@ array(12) {
int(2)
-- Iteration 4 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -170,8 +176,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -180,6 +185,8 @@ array(12) {
int(2)
-- Iteration 5 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(5) "FOUND"
@ -200,8 +207,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -210,6 +216,8 @@ array(12) {
int(5)
-- Iteration 6 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -230,8 +238,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -240,6 +247,8 @@ array(12) {
int(2)
-- Iteration 7 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -260,8 +269,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -270,6 +278,8 @@ array(12) {
int(2)
-- Iteration 8 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -290,8 +300,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -300,6 +309,8 @@ array(12) {
int(0)
-- Iteration 9 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -320,8 +331,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>
@ -330,6 +340,8 @@ array(12) {
int(0)
-- Iteration 10 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -350,8 +362,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(5) "FOUND"
[11]=>
@ -360,6 +371,8 @@ array(12) {
int(1)
-- Iteration 11 --
Warning: Array to string conversion in %s on line %d
array(12) {
[0]=>
string(1) "1"
@ -380,8 +393,7 @@ array(12) {
[8]=>
string(0) ""
[9]=>
array(0) {
}
string(5) "Array"
[10]=>
string(3) "php"
[11]=>