diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-19 17:00:28 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-19 17:00:28 +0400 |
| commit | b7938ab1bd765897bd6f08a48a8aea494a961ea9 (patch) | |
| tree | 22f8034d42dfac8f03b4bb6d6573e5a7f6361ac8 /ext/standard/array.c | |
| parent | 2e3e96b24bb1c547362af53b952f823f451e6bce (diff) | |
| download | php-git-b7938ab1bd765897bd6f08a48a8aea494a961ea9.tar.gz | |
Refactored GC (incomplete)
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 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); |