diff options
| author | Felipe Pena <felipe@php.net> | 2009-07-08 18:21:13 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-07-08 18:21:13 +0000 |
| commit | 0977b2a6f8ee06ab5ebab9a380422305abe2803a (patch) | |
| tree | b05a69e34e91d1fdf28b513ac34ef9b8d6c2a456 /ext/standard/array.c | |
| parent | 07107b8dc651f788f12708f459567bbb7f332029 (diff) | |
| download | php-git-0977b2a6f8ee06ab5ebab9a380422305abe2803a.tar.gz | |
- Fixed bug #48854 (array_merge_recursive modifies arrays after first one)
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 57f15946ce..922bb6e830 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2473,6 +2473,7 @@ static void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETERS, int array_init_size(return_value, init_size); for (i = 0; i < argc; i++) { + SEPARATE_ZVAL(args[i]); if (!replace) { php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive TSRMLS_CC); } else if (recursive && i > 0) { /* First array will be copied directly instead */ |