1
0
mirror of https://github.com/php/php-src.git synced 2026-04-15 20:11:02 +02:00

Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Xinchen Hui
2015-04-14 19:32:28 +08:00

View File

@@ -591,7 +591,7 @@ ZEND_METHOD(exception, getTraceAsString)
str = &res;
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
if(Z_TYPE_P(trace) != IS_ARRAY) {
if (Z_TYPE_P(trace) != IS_ARRAY) {
RETURN_FALSE;
}
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);