com php-src: Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by r eference): NEWS ext/standard/string.c
ext/standard/ tests/strings/bug71969.phpt
| From: | Xinchen Hui | Date: | Wed, 06 Apr 2016 02:19:24 +0000 |
| Subject: | com php-src: Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by r eference): NEWS ext/standard/string.c ext/standard/ tests/strings/bug71969.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91628@lists.php.net to get a copy of this message | ||
Commit: e95782ed5e26c041d62b847dc772f86fe6b01516
Author: Xinchen Hui <laruence@gmail.com> Wed, 6 Apr 2016 10:19:24 +0800
Parents: 6ae3915eee227d88f2b9d4e17952db72e60d9c8b
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e95782ed5e26c041d62b847dc772f86fe6b01516
Log:
Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
Bugs:
https://bugs.php.net/71969
Changed paths:
M NEWS
M ext/standard/string.c
A ext/standard/tests/strings/bug71969.phpt
Diff:
diff --git a/NEWS b/NEWS
index aa6feda..e468c8b 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ PHP NEWS
. Fixed bug #71735 (Double-free in SplDoublyLinkedList::offsetSet). (Stas)
- Standard:
+ . Fixed bug #71969 (str_replace returns an incorrect resulting array after
+ a foreach by reference). (Laruence)
. Fixed bug #71827 (substr_replace bug, string length). (krakjoe)
. Fixed bug #71891 (header_register_callback() and
register_shutdown_function()). (Laruence)
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 24c3862..3f47e73 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4151,6 +4151,7 @@ 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(Z_ARRVAL_P(subject), num_key, string_key, subject_entry) {
+ ZVAL_DEREF(subject_entry);
if (Z_TYPE_P(subject_entry) != IS_ARRAY && Z_TYPE_P(subject_entry) != IS_OBJECT) {
count += php_str_replace_in_subject(search, replace, subject_entry, &result,
case_sensitivity);
} else {
diff --git a/ext/standard/tests/strings/bug71969.phpt b/ext/standard/tests/strings/bug71969.phpt
new file mode 100644
index 0000000..aafceb0
--- /dev/null
+++ b/ext/standard/tests/strings/bug71969.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
+--FILE--
+<?php
+$a = array(
+ array("one" => array("a"=>"0000",
"b"=>"1111")),
+);
+
+//foreach by reference, changing the array value
+foreach($a as &$record)
+{
+ $record["one"]["a"] = "2222";
+}
+var_dump(str_replace("2", "3", $a));
+?>
+--EXPECT--
+array(1) {
+ [0]=>
+ array(1) {
+ ["one"]=>
+ array(2) {
+ ["a"]=>
+ string(4) "2222"
+ ["b"]=>
+ string(4) "1111"
+ }
+ }
+}