Fix phpdbg_break_next()

diff --git a/NEWS b/NEWS
index 2d6e3678836b43e10a2957d8a7c8b84f3220ce62..cd5b7d1b01ed5c66ef5a93db68a51e1496505783 100644 (file)
--- 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 6df123615ac1082bde00c15b78e9678d3d68f2d8..3122a9f6093961b5bb0429a0b4d7bd4ae0b197cc 100644 (file)
--- 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);