diff options
| author | Marcus Boerger <helly@php.net> | 2008-08-24 16:49:19 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-08-24 16:49:19 +0000 |
| commit | ce2f9bb0cf96fbb2aad317d8c9b6d947165ab02c (patch) | |
| tree | 65d326eb144623936e3e94437de14b79b232340d /Zend/zend_objects.c | |
| parent | 0edbdd76808e1f5ed862c4e09faf2115a7ed2988 (diff) | |
| download | php-git-ce2f9bb0cf96fbb2aad317d8c9b6d947165ab02c.tar.gz | |
- MFH Fix issue with destruction of overloaded objects
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 12aebc7c56..9f09af9946 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -53,6 +53,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl if (destructor) { zval *obj; + zend_object_store_bucket *obj_bucket; if (destructor->op_array.fn_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED)) { if (destructor->op_array.fn_flags & ZEND_ACC_PRIVATE) { @@ -87,8 +88,11 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl MAKE_STD_ZVAL(obj); Z_TYPE_P(obj) = IS_OBJECT; Z_OBJ_HANDLE_P(obj) = handle; - /* TODO: We cannot set proper handlers. */ - Z_OBJ_HT_P(obj) = &std_object_handlers; + obj_bucket = &EG(objects_store).object_buckets[handle]; + if (!obj_bucket->bucket.obj.handlers) { + obj_bucket->bucket.obj.handlers = &std_object_handlers; + } + Z_OBJ_HT_P(obj) = obj_bucket->bucket.obj.handlers; zval_copy_ctor(obj); /* Make sure that destructors are protected from previously thrown exceptions. |