archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fix handling of exceptions in dtors

Browse source
This commit is contained in:
Marcus Boerger 2004-09-06 19:13:33 +00:00
parent 963200c74c
commit dd5652e4c1
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_objects.c
View file

@ -76,11 +76,14 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
old_exception = EG(exception); old_exception = EG(exception);
EG(exception) = NULL; EG(exception) = NULL;
zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL); zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL);
if (old_exception) {
if (EG(exception)) { if (EG(exception)) {
zend_error(E_ERROR, "Ignoring exception from %s::__destruct() while an exception is already active", object->ce->name);
zval_ptr_dtor(&EG(exception)); zval_ptr_dtor(&EG(exception));
} }
EG(exception) = old_exception; EG(exception) = old_exception;
} }
}
} }
ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC) ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)