diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-08-23 12:07:14 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-08-23 12:07:14 +0100 |
| commit | 272cccd1759a358eb9a66e3fb10bcad373acb06e (patch) | |
| tree | fc0b727754e2ab7cd5b181e488667e3e4b31421f | |
| parent | 2b9c7f881a30767b0aeed94e88cc978544e78094 (diff) | |
| download | php-git-272cccd1759a358eb9a66e3fb10bcad373acb06e.tar.gz | |
Fix phpdbg_break_next()
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 6df123615a..3122a9f609 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); |