diff options
| author | Zeev Suraski <zeev@php.net> | 2004-02-04 12:30:48 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-02-04 12:30:48 +0000 |
| commit | 5c3e03a2ffba218fd25ec699162971a772246b60 (patch) | |
| tree | 6123c2c0c1b3f1c86156346dc36b40701c63ef6a /Zend/zend_objects_API.c | |
| parent | 6584dca1941868d98a61e6118de23a29d471133e (diff) | |
| download | php-git-5c3e03a2ffba218fd25ec699162971a772246b60.tar.gz | |
The valid bit was necessary after all - restored
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 30bc86cfc4..fbe6492ccf 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -45,11 +45,14 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS zend_uint i = 1; for (i = 1; i < objects->top ; i++) { - 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; - if (obj->dtor) { - obj->dtor(obj->object, i TSRMLS_CC); + if (objects->object_buckets[i].valid) { + 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; + if (obj->dtor) { + obj->dtor(obj->object, i TSRMLS_CC); + } } } } @@ -61,9 +64,12 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects zend_uint i = 1; for (i = 1; i < objects->top ; i++) { - struct _store_object *obj = &objects->object_buckets[i].bucket.obj; - if (obj->free_storage) { - obj->free_storage(obj->object TSRMLS_CC); + if (objects->object_buckets[i].valid) { + struct _store_object *obj = &objects->object_buckets[i].bucket.obj; + + if (obj->free_storage) { + obj->free_storage(obj->object TSRMLS_CC); + } } } } @@ -88,11 +94,13 @@ ZEND_API zend_object_handle zend_objects_store_put(void *object, zend_objects_st } obj = &EG(objects_store).object_buckets[handle].bucket.obj; EG(objects_store).object_buckets[handle].destructor_called = 0; + EG(objects_store).object_buckets[handle].valid = 1; obj->refcount = 1; obj->object = object; obj->dtor = dtor; obj->free_storage = free_storage; + obj->clone = clone; #if ZEND_DEBUG_OBJECTS @@ -111,9 +119,10 @@ ZEND_API void zend_objects_store_add_ref(zval *object TSRMLS_DC) #endif } -#define ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST() \ +#define ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST() \ EG(objects_store).object_buckets[handle].bucket.free_list.next = EG(objects_store).free_list_head; \ - EG(objects_store).free_list_head = handle; \ + EG(objects_store).free_list_head = handle; \ + EG(objects_store).object_buckets[handle].valid = 0; ZEND_API void zend_objects_store_del_ref(zval *zobject TSRMLS_DC) { |