diff options
| author | Andi Gutmans <andi@php.net> | 2004-03-11 13:40:19 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2004-03-11 13:40:19 +0000 |
| commit | a87cc63aaaea367b0062fc6e57e3530ba30712e3 (patch) | |
| tree | 1c7e50718d1cd33917593c1d6b60c5019a15f8d7 /Zend/zend_objects_API.c | |
| parent | aa472500e173653bf5704d5e311da5c055f2ee7c (diff) | |
| download | php-git-a87cc63aaaea367b0062fc6e57e3530ba30712e3.tar.gz | |
- Real fix for bug #27535 (Dmitry)
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index d372d3d960..0718aaa197 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -69,6 +69,7 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects if (obj->free_storage) { obj->free_storage(obj->object TSRMLS_CC); } + /* Not adding to free list as we are shutting down anyway */ } } } @@ -128,25 +129,28 @@ ZEND_API void zend_objects_store_del_ref(zval *zobject TSRMLS_DC) zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); struct _store_object *obj = &EG(objects_store).object_buckets[handle].bucket.obj; - /* Make sure we hold a reference count during the destructor call - otherwise, when the destructor ends the storage might be freed - when the refcount reaches 0 a second time - */ - if (obj->refcount == 1) { - if (!EG(objects_store).object_buckets[handle].destructor_called) { - EG(objects_store).object_buckets[handle].destructor_called = 1; - - if (obj->dtor) { - obj->dtor(obj->object, handle TSRMLS_CC); - } - } + /* Make sure we hold a reference count during the destructor call + otherwise, when the destructor ends the storage might be freed + when the refcount reaches 0 a second time + */ + if (EG(objects_store).object_buckets[handle].valid) { if (obj->refcount == 1) { - if (obj->free_storage && EG(objects_store).object_buckets[handle].valid) { - obj->free_storage(obj->object TSRMLS_CC); + if (!EG(objects_store).object_buckets[handle].destructor_called) { + EG(objects_store).object_buckets[handle].destructor_called = 1; + + if (obj->dtor) { + obj->dtor(obj->object, handle TSRMLS_CC); + } + } + if (obj->refcount == 1) { + if (obj->free_storage) { + obj->free_storage(obj->object TSRMLS_CC); + } + ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); } - ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); } } + obj->refcount--; #if ZEND_DEBUG_OBJECTS |