diff options
| author | Marcus Boerger <helly@php.net> | 2004-09-06 19:13:33 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-09-06 19:13:33 +0000 |
| commit | dd5652e4c15bbefc0d02c221e6f6bed978fd9a4c (patch) | |
| tree | abe134dd1d115a92c4e1fcb0cbc690934eda6415 /Zend/zend_objects.c | |
| parent | 963200c74c6a80234f5684ad14eab9656aaba953 (diff) | |
| download | php-git-dd5652e4c15bbefc0d02c221e6f6bed978fd9a4c.tar.gz | |
- Fix handling of exceptions in dtors
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 85f76302fc..162905256b 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -76,10 +76,13 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl old_exception = EG(exception); EG(exception) = NULL; zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL); - if (EG(exception)) { - zval_ptr_dtor(&EG(exception)); + if (old_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)); + } + EG(exception) = old_exception; } - EG(exception) = old_exception; } } |