com php-src: *Always* clean up and run destructors: sapi/phpdbg/phpdbg_prompt.c
| From: | Bob Weinand | Date: | Tue, 28 Oct 2014 16:25:43 +0000 |
| Subject: | com php-src: *Always* clean up and run destructors: sapi/phpdbg/phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82740@lists.php.net to get a copy of this message | ||
Commit: fe5f5d40f29387bb6cae79dfbab50463a66b53ba
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Oct 2014 12:27:19 +0100
Parents: c7f074b1637ff42016091c84f7e9e23927623271
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fe5f5d40f29387bb6cae79dfbab50463a66b53ba
Log:
*Always* clean up and run destructors
Changed paths:
M sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 73ecbcb..262b265 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -676,10 +676,10 @@ PHPDBG_COMMAND(run) /* {{{ */
EG(active_op_array) = orig_op_array;
EG(opline_ptr) = orig_opline;
EG(return_value_ptr_ptr) = orig_retval_ptr;
-
- phpdbg_clean(1 TSRMLS_CC);
}
+ phpdbg_clean(1 TSRMLS_CC);
+
PHPDBG_G(flags) &= ~PHPDBG_IS_RUNNING;
} else {
phpdbg_error("inactive", "type=\"nocontext\"", "Nothing to
execute!");