com php-src: Set engine back to initial state after fatal-ed ev command: phpdbg_prompt.c
| From: | Bob Weinand | Date: | Sat, 25 Oct 2014 13:29:54 +0000 |
| Subject: | com php-src: Set engine back to initial state after fatal-ed ev command: phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82660@lists.php.net to get a copy of this message | ||
Commit: be5242e0fedcf23bdf56a4b1a73f8a84c5b216ce
Author: Bob Weinand <bobwei9@hotmail.com> Sat, 25 Oct 2014 15:29:54 +0200
Parents: e995ad1131781db91fb58002e06d9c638122df3c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be5242e0fedcf23bdf56a4b1a73f8a84c5b216ce
Log:
Set engine back to initial state after fatal-ed ev command
Changed paths:
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 82444fb..47d8f20 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -689,6 +689,16 @@ PHPDBG_COMMAND(ev) /* {{{ */
zend_bool stepping = ((PHPDBG_G(flags) & PHPDBG_IS_STEPPING) == PHPDBG_IS_STEPPING);
zval retval;
+ zend_op **orig_opline = EG(opline_ptr);
+ zend_op_array *orig_op_array = EG(active_op_array);
+ zval **orig_retval_ptr = EG(return_value_ptr_ptr);
+ zend_execute_data *ex = EG(current_execute_data);
+ HashTable *original_active_symbol_table = EG(active_symbol_table);
+ zval *original_This = EG(This);
+ zend_class_entry *original_scope = EG(scope);
+ zend_class_entry *original_called_scope = EG(called_scope);
+ zend_vm_stack original_stack = EG(argument_stack);
+
if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) {
phpdbg_try_access {
phpdbg_parse_variable(param->str, param->len, &EG(symbol_table), 0,
phpdbg_output_ev_variable, 0 TSRMLS_CC);
@@ -716,6 +726,16 @@ PHPDBG_COMMAND(ev) /* {{{ */
phpdbg_out("\n");
zval_dtor(&retval);
}
+ } zend_catch {
+ EG(active_op_array) = orig_op_array;
+ EG(opline_ptr) = orig_opline;
+ EG(return_value_ptr_ptr) = orig_retval_ptr;
+ EG(current_execute_data) = ex;
+ EG(active_symbol_table) = original_active_symbol_table;
+ EG(This) = original_This;
+ EG(scope) = original_scope;
+ EG(called_scope) = original_called_scope;
+ EG(argument_stack) = original_stack;
} zend_end_try();
PHPDBG_G(flags) &= ~PHPDBG_IN_EVAL;