diff options
| -rw-r--r-- | sapi/phpdbg/phpdbg_info.c | 3 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index 01633e4feb..7963ff35e2 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -386,8 +386,9 @@ PHPDBG_INFO(classes) /* {{{ */ phpdbg_print_class_name(ce TSRMLS_CC); if (ce->parent) { + zend_class_entry *pce; phpdbg_xml("<parents %r>"); - zend_class_entry *pce = ce->parent; + pce = ce->parent; do { phpdbg_out("|-------- "); phpdbg_print_class_name(pce TSRMLS_CC); diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index f567a427af..0ab5b4d230 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -698,10 +698,11 @@ PHPDBG_COMMAND(ev) /* {{{ */ zend_execute_data *original_execute_data = EG(current_execute_data); zend_class_entry *original_scope = EG(scope); zend_vm_stack original_stack = EG(vm_stack); - original_stack->top = EG(vm_stack_top); PHPDBG_OUTPUT_BACKUP(); + original_stack->top = EG(vm_stack_top); + if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) { phpdbg_try_access { phpdbg_parse_variable(param->str, param->len, &EG(symbol_table).ht, 0, phpdbg_output_ev_variable, 0 TSRMLS_CC); @@ -1072,7 +1073,7 @@ PHPDBG_COMMAND(dl) /* {{{ */ PHPDBG_COMMAND(source) /* {{{ */ { - struct stat sb; + zend_stat_t sb; if (VCWD_STAT(param->str, &sb) != -1) { phpdbg_try_file_init(param->str, param->len, 0 TSRMLS_CC); |