diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-01 10:25:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-01 10:25:10 +0800 |
| commit | a8a17a72b06e6ea39a70eaf45ad2c3d6668e29ba (patch) | |
| tree | 4cae24e0c78f7580e707bcab3d19729eca3b318c /Zend/zend_builtin_functions.c | |
| parent | 0056f52f500f9056039e8976e1100c9f154daa75 (diff) | |
| download | php-git-a8a17a72b06e6ea39a70eaf45ad2c3d6668e29ba.tar.gz | |
RC manipulation cleanup
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 04bb9142d2..7190af97a4 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -648,15 +648,16 @@ ZEND_FUNCTION(each) /* add value elements */ ZVAL_DEREF(entry); - if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); - if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); + if (Z_REFCOUNTED_P(entry)) { + GC_ADDREF_EX(Z_COUNTED_P(entry), 2); + } zend_hash_index_add_new(Z_ARRVAL_P(return_value), 1, entry); zend_hash_add_new(Z_ARRVAL_P(return_value), ZSTR_KNOWN(ZEND_STR_VALUE), entry); /* add the key elements */ if (zend_hash_get_current_key(target_hash, &key, &num_key) == HASH_KEY_IS_STRING) { ZVAL_STR_COPY(&tmp, key); - if (Z_REFCOUNTED(tmp)) Z_ADDREF(tmp); + Z_TRY_ADDREF(tmp); } else { ZVAL_LONG(&tmp, num_key); } |