diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-18 20:51:50 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-18 20:51:50 +0200 |
| commit | cdde07d059101a05bc43b79932b01d8228bcee40 (patch) | |
| tree | db38560b2bf7071a4927c5043e44208fff408684 /ext/standard/array.c | |
| parent | b634ded197f0b79c3c6aa804181b37aeaa15fc58 (diff) | |
| parent | c2da50bc41daa96a36d8a25d4dbbde907b7edfdb (diff) | |
| download | php-git-cdde07d059101a05bc43b79932b01d8228bcee40.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index b44472366f..8ebf4e1789 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -5978,19 +5978,17 @@ PHP_FUNCTION(array_reduce) fci.no_separation = 0; ZEND_HASH_FOREACH_VAL(htbl, operand) { - ZVAL_COPY(&args[0], &result); + ZVAL_COPY_VALUE(&args[0], &result); ZVAL_COPY(&args[1], operand); fci.params = args; if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[0]); - zval_ptr_dtor(&result); ZVAL_COPY_VALUE(&result, &retval); } else { zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[0]); - zval_ptr_dtor(&result); return; } } ZEND_HASH_FOREACH_END(); |