diff options
| author | Arpad Ray <arpad@php.net> | 2011-08-29 20:38:52 +0000 |
|---|---|---|
| committer | Arpad Ray <arpad@php.net> | 2011-08-29 20:38:52 +0000 |
| commit | a912bd3c23ec6a5609cc3adc2ce69b467c34921c (patch) | |
| tree | e442db86be982bae877591b9710205b34544694e | |
| parent | 98b42d722de55313a0ce6cf5ae6b9ab68845db40 (diff) | |
| download | php-git-a912bd3c23ec6a5609cc3adc2ce69b467c34921c.tar.gz | |
Fixed bug #55366: keys lost when using substr_replace an array
| -rw-r--r-- | ext/standard/string.c | 12 | ||||
| -rw-r--r-- | ext/standard/tests/strings/substr_replace_array.phpt | 19 |
2 files changed, 30 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 62599d4019..dd43665525 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2398,6 +2398,10 @@ PHP_FUNCTION(substr_replace) RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1); } } else { /* str is array of strings */ + char *str_index = NULL; + uint str_index_len; + ulong num_index; + array_init(return_value); if (Z_TYPE_PP(from) == IS_ARRAY) { @@ -2533,7 +2537,13 @@ PHP_FUNCTION(substr_replace) } 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) { zval_dtor(orig_str); } diff --git a/ext/standard/tests/strings/substr_replace_array.phpt b/ext/standard/tests/strings/substr_replace_array.phpt new file mode 100644 index 0000000000..dbb8b17147 --- /dev/null +++ b/ext/standard/tests/strings/substr_replace_array.phpt @@ -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 +) |