diff options
| author | Marcus Boerger <helly@php.net> | 2004-02-25 08:16:54 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-02-25 08:16:54 +0000 |
| commit | b0529e5485b1dafb58e3dae6e37315ebd401d714 (patch) | |
| tree | b8495ef000e52d2fc17a98bccc6ab8bc88f95cc7 /Zend/zend_objects_API.c | |
| parent | 98f725b0e0b03b3a4781858cbc13bd1c8de6a473 (diff) | |
| download | php-git-b0529e5485b1dafb58e3dae6e37315ebd401d714.tar.gz | |
Fix object destruction/free in shutdown
- set destructor_called even when no dtor is given
- use free_storage even when no dtor hat to be called
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index bff88f11fd..330879cc0c 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -49,9 +49,9 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS struct _store_object *obj = &objects->object_buckets[i].bucket.obj; if (obj->dtor && !objects->object_buckets[i].destructor_called) { - objects->object_buckets[i].destructor_called = 1; obj->dtor(obj->object, i TSRMLS_CC); } + objects->object_buckets[i].destructor_called = 1; } } } @@ -133,13 +133,11 @@ ZEND_API void zend_objects_store_del_ref(zval *zobject TSRMLS_DC) if (obj->dtor) { obj->dtor(obj->object, handle TSRMLS_CC); } - if (obj->refcount == 0) { - if (obj->free_storage) { - obj->free_storage(obj->object TSRMLS_CC); - } - ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); - } } + if (obj->free_storage) { + obj->free_storage(obj->object TSRMLS_CC); + } + ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); #if ZEND_DEBUG_OBJECTS fprintf(stderr, "Deallocated object id #%d\n", handle); #endif |