diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-08-16 09:20:46 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-08-16 09:20:46 +0000 |
| commit | d93cf2a2d0834962f713eceb3304c80d6fb66524 (patch) | |
| tree | 723f3361b8594633ccb85656bea913ff15533639 /Zend/zend_objects.c | |
| parent | e461c22ea97e1ee7721e45c3627519e939844095 (diff) | |
| download | php-git-d93cf2a2d0834962f713eceb3304c80d6fb66524.tar.gz | |
Bug #52361 (Throwing an exception in a destructor causes invalid catching)
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 6a87284ced..cfd9a4ef82 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -117,15 +117,13 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl zend_error(E_ERROR, "Attempt to destruct pending exception"); } else { old_exception = EG(exception); - Z_ADDREF_P(old_exception); + EG(exception) = NULL; } } - zend_exception_save(TSRMLS_C); zend_call_method_with_0_params(&obj, object->ce, &destructor, ZEND_DESTRUCTOR_FUNC_NAME, NULL); - zend_exception_restore(TSRMLS_C); if (old_exception) { if (EG(exception)) { - zval_ptr_dtor(&old_exception); + zend_exception_set_previous(EG(exception), old_exception TSRMLS_CC); } else { EG(exception) = old_exception; } |