diff options
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index d334785135..c6b21c73d1 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1464,9 +1464,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu if (zend_hash_find(eg_active_symbol_table, Z_STRVAL_P(entry), Z_STRLEN_P(entry) + 1, (void **)&value_ptr) != FAILURE) { value = *value_ptr; ALLOC_ZVAL(data); - *data = *value; - zval_copy_ctor(data); - INIT_PZVAL(data); + MAKE_COPY_ZVAL(&value, data); zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(entry), Z_STRLEN_P(entry) + 1, &data, sizeof(zval *), NULL); } @@ -4089,9 +4087,7 @@ PHP_FUNCTION(array_reduce) if (ZEND_NUM_ARGS() > 2) { ALLOC_ZVAL(result); - *result = *initial; - zval_copy_ctor(result); - INIT_PZVAL(result); + MAKE_COPY_ZVAL(&initial, result); } else { MAKE_STD_ZVAL(result); ZVAL_NULL(result); |