From 82a538c4fae8c2bce3d8dcb45483b1e30c43a60e Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 10 May 2006 21:11:48 +0000 Subject: [PATCH] - Enforece rule of disallowing throw in __toString() --- Zend/zend_object_handlers.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 2e0c3739fb..e85f4180e9 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1063,10 +1063,12 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty case IS_UNICODE: ce = Z_OBJCE_P(readobj); if (ce->__tostring && - zend_call_method_with_0_params(&readobj, ce, &ce->__tostring, "__tostring", &retval)) { + (zend_call_method_with_0_params(&readobj, ce, &ce->__tostring, "__tostring", &retval) || EG(exception))) { if (EG(exception)) { - zval_ptr_dtor(&retval); - zend_error(E_ERROR, "Method %v::__toString() must not throw an exception", ce->name); + if (retval) { + zval_ptr_dtor(&retval); + } + zend_error(E_ERROR, "Method %s::__toString() must not throw an exception", ce->name); return FAILURE; } if (Z_TYPE_P(retval) == (UG(unicode)?IS_UNICODE:IS_STRING)) { -- 2.50.1