com php-src: Fix phpdbg_break_next(): NEWS sapi/p hpdbg/phpdbg_bp.c

Commit: 272cccd1759a358eb9a66e3fb10bcad373acb06e Author: Bob Weinand <bobwei9@hotmail.com> Sun, 23 Aug 2015 12:07:14 +0100 Parents: 2b9c7f881a30767b0aeed94e88cc978544e78094 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=272cccd1759a358eb9a66e3fb10bcad373acb06e Log: Fix phpdbg_break_next() Changed paths: M NEWS M sapi/phpdbg/phpdbg_bp.c Diff: diff --git a/NEWS b/NEWS index 2d6e367..cd5b7d1 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,9 @@ PHP NEWS . Fixed bug #70232 (Incorrect bump-along behavior with \K and empty string match). (cmb) +- Phpdbg: + . Fix phpdbg_break_next() sometimes not breaking. (Bob) + - SPL: . Fixed bug #70290 (Null pointer deref (segfault) in spl_autoload via ob_start). (hugh at allthethings dot co dot nz) diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index 6df1236..3122a9f 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -687,6 +687,7 @@ PHPDBG_API void phpdbg_set_breakpoint_opline_ex(phpdbg_opline_ptr_t opline TSRML PHPDBG_BREAK_INIT(new_break, PHPDBG_BREAK_OPLINE); new_break.opline = (zend_ulong) opline; + new_break.base = NULL; zend_hash_index_update(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE], (zend_ulong) opline, &new_break, sizeof(phpdbg_breakline_t), NULL);