archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed apply_func_args_t

Browse source
This commit is contained in:
Xinchen Hui 2014-05-25 20:04:35 +08:00
parent 0175d994c0
commit bc357eaf3f
5 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_exceptions.c
View file

@ -569,7 +569,7 @@ static int _build_trace_string(zval *frame TSRMLS_DC, int num_args, va_list args
if (tmp) {
if (Z_TYPE_P(tmp) == IS_ARRAY) {
int last_len = str->len;
zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, (apply_func_args_t)_build_trace_args, 1, &str);
zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, _build_trace_args, 1, &str);
if (last_len != str->len) {
str->len -= 2; /* remove last ', ' */
}
@ -597,7 +597,7 @@ ZEND_METHOD(exception, getTraceAsString)
str = STR_ALLOC(0, 0);
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 2, &str, &num);
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, _build_trace_string, 2, &str, &num);
len = sprintf(s_tmp, "#%d {main}", num);
TRACE_APPEND_STRL(s_tmp, len);