com php-src: Fixed res leak: Zend/zend_exceptions.c
| From: | Xinchen Hui | Date: | Wed, 15 Apr 2015 02:38:55 +0000 |
| Subject: | com php-src: Fixed res leak: Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86252@lists.php.net to get a copy of this message | ||
Commit: 82ec0d5fc5fd7e06153c0c658875cd8eaca9cd61
Author: Xinchen Hui <laruence@php.net> Wed, 15 Apr 2015 10:38:55 +0800
Parents: be504995c351a2582e82b52bd4e0383e9e27783d
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82ec0d5fc5fd7e06153c0c658875cd8eaca9cd61
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 3e50422..f7eac92 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);