summaryrefslogtreecommitdiff
path: root/Zend/zend_object_handlers.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2012-09-06 12:14:29 +0400
committerDmitry Stogov <dmitry@zend.com>2012-09-06 12:14:29 +0400
commit6ba376f552238de643a665d355fd5e59c40315b5 (patch)
treed5a066fee542d75ea1c369a8eba1b5caa8f48c72 /Zend/zend_object_handlers.c
parenta43c45ea7d354179df91a59795faa0bcbceb1812 (diff)
parentb29dc146b9311c14186c14bcb1c8ae5288b65d73 (diff)
downloadphp-git-6ba376f552238de643a665d355fd5e59c40315b5.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function) Conflicts: NEWS Zend/zend_object_handlers.c
Diffstat (limited to 'Zend/zend_object_handlers.c')
-rw-r--r--Zend/zend_object_handlers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 60095f7062..d82493aeaf 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1490,6 +1490,7 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty
if (retval) {
zval_ptr_dtor(&retval);
}
+ EG(exception) = NULL;
zend_error_noreturn(E_ERROR, "Method %s::__toString() must not throw an exception", ce->name);
return FAILURE;
}