diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-26 18:11:45 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-26 21:49:18 +0200 |
| commit | 9e8fec1ef70bc5ad79b9c471cf1c6a0845a25785 (patch) | |
| tree | 06c3ebe1117536c0b10b27328452f8a6dc77c0ff /sapi/phpdbg/phpdbg_prompt.c | |
| parent | a717acd21a0cd9c4d41c6dfbb536399e9258824d (diff) | |
| download | php-git-9e8fec1ef70bc5ad79b9c471cf1c6a0845a25785.tar.gz | |
Fix leaks from bug #70138
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 5b5ac2a075..9d40d000c2 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -691,7 +691,6 @@ PHPDBG_COMMAND(run) /* {{{ */ PHPDBG_G(in_execution) = 0; if (!(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) { - phpdbg_error("stop", "type=\"bailout\"", "Caught exit/error from VM"); restore = 0; } else { zend_bailout(); @@ -710,9 +709,10 @@ PHPDBG_COMMAND(run) /* {{{ */ PHPDBG_G(in_execution) = 1; } - phpdbg_clean(1); PHPDBG_G(flags) &= ~PHPDBG_IS_RUNNING; + + phpdbg_clean(1); } else { phpdbg_error("inactive", "type=\"nocontext\"", "Nothing to execute!"); } @@ -794,6 +794,7 @@ PHPDBG_COMMAND(ev) /* {{{ */ EG(vm_stack_top) = original_stack->top; EG(vm_stack_end) = original_stack->end; EG(vm_stack) = original_stack; + EG(exit_status) = 0; } zend_end_try(); PHPDBG_G(flags) &= ~PHPDBG_IN_EVAL; |