diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2016-07-27 18:18:47 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2016-07-27 18:18:47 +0200 |
commit | dfb3e270c2c0319c2e1bcaf53e0e0f9921d5cae2 (patch) | |
tree | 2a88bbcd08840dd2ecb1128bd5b93cd45d041267 /Zend | |
parent | be11563fa2024b6724754a0d56f247b7f410b202 (diff) | |
parent | 5513f00a972d1781349035cc097971fb9056cce1 (diff) | |
download | php-git-dfb3e270c2c0319c2e1bcaf53e0e0f9921d5cae2.tar.gz |
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/zend_gc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 0e18a497a5..377280e17c 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -1144,6 +1144,7 @@ ZEND_API int zend_gc_collect_cycles(void) if (EG(objects_store).object_buckets && IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle])) { + EG(objects_store).object_buckets[obj->handle] = SET_OBJ_INVALID(obj); GC_TYPE(obj) = IS_NULL; if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED; |