com php-src: Fixed res leak: Zend/zend_exceptions.c
| From: | Ferenc Kovacs | Date: | Wed, 15 Apr 2015 17:43:40 +0000 |
| Subject: | com php-src: Fixed res leak: Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86302@lists.php.net to get a copy of this message | ||
Commit: bf393c89d8d6f31264598d770a96cce446fb9a81
Author: Xinchen Hui <laruence@php.net> Wed, 15 Apr 2015 10:38:55 +0800
Committer: Ferenc Kovacs <tyrael@php.net> Wed, 15 Apr 2015 19:43:40 +0200
Parents: f251b16fccaa33c5ceb03811cc20b8b25737a1ee
Branches: PHP-5.6.8
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf393c89d8d6f31264598d770a96cce446fb9a81
Log:
Fixed res leak
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f163495..78d6e32 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);