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

Merge branch 'PHP-5.6'

Browse source 
Conflicts:
	Zend/zend_exceptions.c
This commit is contained in:
Xinchen Hui 2015-04-14 19:33:46 +08:00
commit e68b851217
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_exceptions.c
View file

@ -557,7 +557,7 @@ ZEND_METHOD(exception, getTraceAsString)
DEFAULT_0_PARAMS; DEFAULT_0_PARAMS;
trace = zend_read_property(base_exception_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv); trace = zend_read_property(base_exception_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv);
if(Z_TYPE_P(trace) != IS_ARRAY) { if (Z_TYPE_P(trace) != IS_ARRAY) {
RETURN_FALSE; RETURN_FALSE;
} }
ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) { ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) {