diff options
| author | Andi Gutmans <andi@php.net> | 2002-07-07 19:34:34 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-07-07 19:34:34 +0000 |
| commit | 4271895222f782bccd2f2732bc98529de87845fe (patch) | |
| tree | 4f8c1488f6d94dc950696392743f2c9769ade33e | |
| parent | e5bcd202ce216ca9ab2e898d0522e7be4d97efab (diff) | |
| download | php-git-4271895222f782bccd2f2732bc98529de87845fe.tar.gz | |
- First try at solving problem with different objects being allocated the
- same id.
| -rw-r--r-- | Zend/zend_objects_API.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index e37e827486..8b2dd624d6 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -115,12 +115,14 @@ void zend_objects_store_del_ref(zval *zobject TSRMLS_DC) if (--obj->refcount == 0) { if (EG(objects_store).object_buckets[handle].valid) { - if(obj->dtor && !EG(objects_store).object_buckets[handle].destructor_called) { + if(!EG(objects_store).object_buckets[handle].destructor_called) { EG(objects_store).object_buckets[handle].destructor_called = 1; - obj->dtor(obj->object, handle TSRMLS_CC); + if (obj->dtor) { + obj->dtor(obj->object, handle TSRMLS_CC); + } + ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); } } - ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); #if ZEND_DEBUG_OBJECTS fprintf(stderr, "Deallocated object id #%d\n", handle); #endif |