Fixed memory leaks (related to bug #52361)

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 178ef50e7c502bfe36520775b5a10fae1d30d052..8a84c78db952a7f96f86cddfd774a350a56e0162 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -572,6 +572,7 @@ ZEND_METHOD(exception, __toString)
                zend_call_function(&fci, NULL TSRMLS_CC);
 
                if (Z_TYPE_P(trace) != IS_STRING) {
+                       zval_ptr_dtor(&trace);
                        trace = NULL;
                }
 
@@ -592,6 +593,10 @@ ZEND_METHOD(exception, __toString)
                zval_dtor(&line);
 
                exception = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 0 TSRMLS_CC);
+
+               if (trace) {
+                       zval_ptr_dtor(&trace);
+               }
        }
        zval_dtor(&fname);
 
@@ -599,10 +604,6 @@ ZEND_METHOD(exception, __toString)
         * the result in uncaught exception handlers without memleaks. */
        zend_update_property_string(default_exception_ce, getThis(), "string", sizeof("string")-1, str TSRMLS_CC);
 
-       if (trace) {
-               zval_ptr_dtor(&trace);
-       }
-
        RETURN_STRINGL(str, len, 0);
 }
 /* }}} */