Always only halt upon first non-recv opcode in a function

This commit is contained in:
Bob Weinand 2015-07-19 20:32:46 +02:00
parent 1f9bba68a9
commit 50e76d951e

View file

@ -1080,8 +1080,9 @@ PHPDBG_API phpdbg_breakbase_t *phpdbg_find_breakpoint(zend_execute_data *execute
}
if (PHPDBG_G(flags) & (PHPDBG_HAS_METHOD_BP|PHPDBG_HAS_SYM_BP)) {
/* check we are at the beginning of the stack */
if (execute_data->opline == execute_data->func->op_array.opcodes) {
zend_op_array *op_array = &execute_data->func->op_array;
/* check we are at the beginning of the stack, but after argument RECV */
if (execute_data->opline == op_array->opcodes + op_array->num_args + !!(op_array->fn_flags & ZEND_ACC_VARIADIC)) {
if ((base = phpdbg_find_breakpoint_symbol(execute_data->func))) {
goto result;
}