diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
| commit | 9692e74b04eacf7a46f65df8db3eef34e695dba9 (patch) | |
| tree | 3f9fbbb318fd90987e5f5b3f1e59683113cc3c4a /ext/standard/array.c | |
| parent | 163f51a4cfc50f872dc5df42a4b3c12ae921764a (diff) | |
| parent | 5d3cf577aad15b119c137a873f468c0614f2eb2e (diff) | |
| download | php-git-9692e74b04eacf7a46f65df8db3eef34e695dba9.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 519b665df0..ca72adfaeb 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2588,7 +2588,7 @@ PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src) /* {{{ */ } ZVAL_UNDEF(&tmp); if (Z_TYPE_P(src_zval) == IS_OBJECT) { - ZVAL_DUP(&tmp, src_zval); + ZVAL_COPY(&tmp, src_zval); convert_to_array(&tmp); src_zval = &tmp; } @@ -4624,7 +4624,7 @@ PHP_FUNCTION(array_sum) if (Z_TYPE_P(entry) == IS_ARRAY || Z_TYPE_P(entry) == IS_OBJECT) { continue; } - ZVAL_DUP(&entry_n, entry); + ZVAL_COPY(&entry_n, entry); convert_scalar_to_number(&entry_n); fast_add_function(return_value, return_value, &entry_n); } ZEND_HASH_FOREACH_END(); @@ -4653,7 +4653,7 @@ PHP_FUNCTION(array_product) if (Z_TYPE_P(entry) == IS_ARRAY || Z_TYPE_P(entry) == IS_OBJECT) { continue; } - ZVAL_DUP(&entry_n, entry); + ZVAL_COPY(&entry_n, entry); convert_scalar_to_number(&entry_n); if (Z_TYPE(entry_n) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) { |