diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-05-31 12:59:31 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-05-31 12:59:31 +0000 |
| commit | 51e52e20ef9f1947658827fabb4bcb36aee40afd (patch) | |
| tree | 6b476dfdacd55c95251963ad5c85f26152345579 /Zend/zend_objects_API.c | |
| parent | 47edd8a303d27afe9ac8f84d0e923c713d294670 (diff) | |
| download | php-git-51e52e20ef9f1947658827fabb4bcb36aee40afd.tar.gz | |
Support for nested exceptions and fatal errors in destructors
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 83e7b5ff03..7ea9d14c68 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -165,6 +165,7 @@ ZEND_API void zend_objects_store_del_ref(zval *zobject TSRMLS_DC) ZEND_API void zend_objects_store_del_ref_by_handle(zend_object_handle handle TSRMLS_DC) { struct _store_object *obj; + int failure = 0; if (!EG(objects_store).object_buckets) { return; @@ -182,12 +183,20 @@ ZEND_API void zend_objects_store_del_ref_by_handle(zend_object_handle handle TSR EG(objects_store).object_buckets[handle].destructor_called = 1; if (obj->dtor) { - obj->dtor(obj->object, handle TSRMLS_CC); + zend_try { + obj->dtor(obj->object, handle TSRMLS_CC); + } zend_catch { + failure = 1; + } zend_end_try(); } } if (obj->refcount == 1) { if (obj->free_storage) { - obj->free_storage(obj->object TSRMLS_CC); + zend_try { + obj->free_storage(obj->object TSRMLS_CC); + } zend_catch { + failure = 1; + } zend_end_try(); } ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(); } @@ -203,6 +212,9 @@ ZEND_API void zend_objects_store_del_ref_by_handle(zend_object_handle handle TSR fprintf(stderr, "Decreased refcount of object id #%d\n", handle); } #endif + if (failure) { + zend_bailout(); + } } ZEND_API zend_object_value zend_objects_store_clone_obj(zval *zobject TSRMLS_DC) |