mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 21:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFZE1

Browse Source
This commit is contained in:
Thies C. Arntzen 2002-10-21 08:48:55 +00:00
parent b26f6233d8
commit d7648f440c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_builtin_functions.c
View File

@ -1306,6 +1306,7 @@ ZEND_FUNCTION(debug_backtrace)
void **cur_arg_pos = EG(argument_stack).top_element; void **cur_arg_pos = EG(argument_stack).top_element;
void **args = cur_arg_pos; void **args = cur_arg_pos;
int arg_stack_consistent = 0; int arg_stack_consistent = 0;
int frames_on_stack = 0;
if (ZEND_NUM_ARGS()) { if (ZEND_NUM_ARGS()) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -1316,6 +1317,7 @@ ZEND_FUNCTION(debug_backtrace)
break; break;
} }
args -= *(ulong*)args; args -= *(ulong*)args;
frames_on_stack++;
if (args == EG(argument_stack).elements) { if (args == EG(argument_stack).elements) {
arg_stack_consistent = 1; arg_stack_consistent = 1;
@ -1328,6 +1330,7 @@ ZEND_FUNCTION(debug_backtrace)
/* skip debug_backtrace() */ /* skip debug_backtrace() */
ptr = ptr->prev_execute_data; ptr = ptr->prev_execute_data;
cur_arg_pos -= 2; cur_arg_pos -= 2;
frames_on_stack--;
array_init(return_value); array_init(return_value);
@ -1370,8 +1373,9 @@ ZEND_FUNCTION(debug_backtrace)
} }
if ((! ptr->opline) || ((ptr->opline->opcode == ZEND_DO_FCALL_BY_NAME) || (ptr->opline->opcode == ZEND_DO_FCALL))) { if ((! ptr->opline) || ((ptr->opline->opcode == ZEND_DO_FCALL_BY_NAME) || (ptr->opline->opcode == ZEND_DO_FCALL))) {
if (arg_stack_consistent) { if (arg_stack_consistent && (frames_on_stack > 0)) {
add_assoc_zval_ex(stack_frame, "args", sizeof("args"), debug_backtrace_get_args(&cur_arg_pos TSRMLS_CC)); add_assoc_zval_ex(stack_frame, "args", sizeof("args"), debug_backtrace_get_args(&cur_arg_pos TSRMLS_CC));
frames_on_stack--;
} }
} }
} else { } else {