From b7938ab1bd765897bd6f08a48a8aea494a961ea9 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 19 Mar 2014 17:00:28 +0400 Subject: Refactored GC (incomplete) --- ext/standard/array.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/standard/array.c') diff --git a/ext/standard/array.c b/ext/standard/array.c index cb3aa761bc..ab16b67ee0 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2258,9 +2258,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS if (Z_ISREF_P(dest_entry)) { if (Z_REFCOUNT_P(dest_entry) == 1) { - zend_reference *ref = Z_REF_P(dest_entry); - ZVAL_COPY_VALUE(dest_entry, dest_zval); - efree(ref); + ZVAL_UNREF(dest_entry); } else { Z_DELREF_P(dest_entry); ZVAL_DUP(dest_entry, dest_zval); -- cgit v1.2.1