Commit: e8c98020efcd9534830758bc458f4189496b54fc Author: krakjoe <joe.watk...@live.co.uk> Mon, 11 Nov 2013 14:55:36 +0000 Parents: 97fda0eaf29310df1224e2eb826eb1d41a076e0e Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e8c98020efcd9534830758bc458f4189496b54fc Log: fix breakpoint in userland Changed paths: M phpdbg.c Diff: diff --git a/phpdbg.c b/phpdbg.c index f686c1a..2845add 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -96,9 +96,11 @@ static PHP_RSHUTDOWN_FUNCTION(phpdbg) /* {{{ */ static PHP_FUNCTION(phpdbg_break) /* {{{ */ { - if (EG(current_execute_data)) { + if (EG(current_execute_data) && EG(active_op_array)) { + zend_ulong opline_num = EG(current_execute_data)->opline - EG(active_op_array)->opcodes; + phpdbg_set_breakpoint_opline_ex( - EG(current_execute_data)->opline TSRMLS_CC); + &EG(active_op_array)->opcodes[opline_num+1] TSRMLS_CC); } } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
