diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 15:14:53 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 15:14:53 +0000 |
| commit | 6597d8638922e8744d6106e7c70d03c242b00adc (patch) | |
| tree | 1d19dffa5b8c829d4bc1a04239bf3fce8865abee | |
| parent | eacab735e0b174aa3865ac50bd19e76801f769fa (diff) | |
| parent | 148d7cc103a0f33e417f44769a8ff4f862107c49 (diff) | |
| download | php-git-6597d8638922e8744d6106e7c70d03c242b00adc.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
windows
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 529ab04194..f586bb5a84 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -552,6 +552,7 @@ PHPDBG_COMMAND(run) /* {{{ */ zend_op_array *orig_op_array = EG(active_op_array); zval **orig_retval_ptr = EG(return_value_ptr_ptr); zend_bool restore = 1; + zend_execute_data *ex = EG(current_execute_data); if (!PHPDBG_G(ops)) { if (phpdbg_compile(TSRMLS_C) == FAILURE) { @@ -567,7 +568,6 @@ PHPDBG_COMMAND(run) /* {{{ */ } /* clean up from last execution */ - zend_execute_data *ex = EG(current_execute_data); if (ex && ex->symbol_table) { zend_hash_clean(ex->symbol_table); } |