summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-04-15 10:38:55 +0800
committerStanislav Malyshev <stas@php.net>2015-04-14 21:16:17 -0700
commite249836ea69edd0f4141c694f451eafe93199bd6 (patch)
treef9a6aa6c14d14ccb563714ea9bd69ac54d713ce5
parent789fb16f4db4f28041cacc304c5e41aced356e23 (diff)
downloadphp-git-PHP-5.4.40.tar.gz
Fixed res leakphp-5.4.40PHP-5.4.40
-rw-r--r--Zend/zend_exceptions.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 1ca2eadbf4..06be9885d5 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -587,13 +587,14 @@ ZEND_METHOD(exception, getTraceAsString)
DEFAULT_0_PARAMS;
- res = estrdup("");
- str = &res;
-
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
if(Z_TYPE_P(trace) != IS_ARRAY) {
RETURN_FALSE;
}
+
+ res = estrdup("");
+ str = &res;
+
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);