com php-src: fix infruritating segfault: phpdbg_prompt.c

From: Date: Sat, 23 Nov 2013 14:25:45 +0000
Subject: com php-src: fix infruritating segfault: phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74696@lists.php.net to get a copy of this message
Commit: eafaa65a087e47ea9764a49c4fa4e9178503e5bd Author: krakjoe <joe.watkins@live.co.uk> Sat, 23 Nov 2013 14:25:45 +0000 Parents: 62cf2bea553b49c8552e8da9dccf6c665d7b1461 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eafaa65a087e47ea9764a49c4fa4e9178503e5bd Log: fix infruritating segfault Changed paths: M phpdbg_prompt.c Diff: diff --git a/phpdbg_prompt..c b/phpdbg_prompt.c index 2deb378..f34eaaf 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -593,13 +593,15 @@ PHPDBG_COMMAND(eval) /* {{{ */ /* disable stepping while eval() in progress */ PHPDBG_G(flags) |= PHPDBG_IN_EVAL; - if (zend_eval_stringl(param->str, param->len, - &retval, "eval()'d code" TSRMLS_CC) == SUCCESS) { - zend_print_zval_r( - &retval, 0 TSRMLS_CC); - phpdbg_writeln(EMPTY); - zval_dtor(&retval); - } + zend_try { + if (zend_eval_stringl(param->str, param->len, + &retval, "eval()'d code" TSRMLS_CC) == SUCCESS) { + zend_print_zval_r( + &retval, 0 TSRMLS_CC); + phpdbg_writeln(EMPTY); + zval_dtor(&retval); + } + } zend_end_try(); PHPDBG_G(flags) &= ~PHPDBG_IN_EVAL; /* switch stepping back on */ @@ -607,6 +609,8 @@ PHPDBG_COMMAND(eval) /* {{{ */ !(PHPDBG_G(flags) & PHPDBG_IS_STEPONEVAL)) { PHPDBG_G(flags) |= PHPDBG_IS_STEPPING; } + + CG(unclean_shutdown) = 0; } break; phpdbg_default_switch_case();

« previous php.cvs (#74696) next »