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

Fixed bug #55366: keys lost when using substr_replace an array

Browse source
This commit is contained in:
Arpad Ray 2011-08-29 20:38:52 +00:00
parent 98b42d722d
commit a912bd3c23
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/standard/string.c
View file

@ -2398,6 +2398,10 @@ PHP_FUNCTION(substr_replace)
RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1); RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
} }
} else { /* str is array of strings */ } else { /* str is array of strings */
char *str_index = NULL;
uint str_index_len;
ulong num_index;
array_init(return_value); array_init(return_value);
if (Z_TYPE_PP(from) == IS_ARRAY) { if (Z_TYPE_PP(from) == IS_ARRAY) {
@ -2533,7 +2537,13 @@ PHP_FUNCTION(substr_replace)
} }
result[result_len] = '\0'; result[result_len] = '\0';
add_next_index_stringl(return_value, result, result_len, 0);
if (zend_hash_get_current_key_ex(Z_ARRVAL_PP(str), &str_index, &str_index_len, &num_index, 0, &pos_str) == HASH_KEY_IS_STRING) {
add_assoc_stringl_ex(return_value, str_index, str_index_len, result, result_len, 0);
} else {
add_index_stringl(return_value, num_index, result, result_len, 0);
}
if(Z_TYPE_PP(tmp_str) != IS_STRING) { if(Z_TYPE_PP(tmp_str) != IS_STRING) {
zval_dtor(orig_str); zval_dtor(orig_str);
} }

19
ext/standard/tests/strings/substr_replace_array.phpt Normal file
View file

@ -0,0 +1,19 @@
--TEST--
substr_replace() function - array
--FILE--
<?php
$arr = array('abc' => 'llsskdkk','def' => 'llsskjkkdd', 4 => 'hello', 42 => 'world');
$newarr = substr_replace($arr, 'zzz', 0, -2);
print_r($newarr);
?>
--EXPECTF--
Array
(
[abc] => zzzkk
[def] => zzzdd
[4] => zzzlo
[42] => zzzld
)