diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-30 11:20:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-30 11:20:46 +0800 |
| commit | e4fe53e2007791ff20fa00d5663f1766ccc5b148 (patch) | |
| tree | babe4fad53c9286c91841f6c081ca3b6211138f4 /Zend/zend_objects_API.c | |
| parent | 5015c4af6c1d2af992e0525f10e93b01043730e1 (diff) | |
| parent | 7da6498342d76c34892bfa247bc1779d8f5ee1e6 (diff) | |
| download | php-git-e4fe53e2007791ff20fa00d5663f1766ccc5b148.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 1fe5d0c199..b5dd48f798 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -57,6 +57,11 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS obj->dtor(obj->object, i TSRMLS_CC); obj = &objects->object_buckets[i].bucket.obj; obj->refcount--; + + if (obj->refcount == 0) { + /* in case gc_collect_cycle is triggered before free_storage */ + GC_REMOVE_ZOBJ_FROM_BUFFER(obj); + } } } } |