From: Marcus Boerger <helly@php.net>
Date: Wed, 10 May 2006 21:12:48 +0000 (+0000)
Subject: - Enforece rule of disallowing throw in __toString()
X-Git-Tag: php-5.2.0RC1~604
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f16bdce2844bc4523d6fb804b1102f429da1a4e8;p=php

- Enforece rule of disallowing throw in __toString()
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 1f57ecf851..5e2894a198 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1034,9 +1034,11 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty
 		case IS_STRING:
 			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);
+                	if (retval) {
+	                	zval_ptr_dtor(&retval);
+	                }
 					zend_error(E_ERROR, "Method %s::__toString() must not throw an exception", ce->name);
                 	return FAILURE;
                 }