Skip to content

Commit c2a6a7d

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix phpGH-15208: Segfault with breakpoint map and phpdbg_clear()
2 parents 408f5f8 + 5ff67f8 commit c2a6a7d

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

sapi/phpdbg/phpdbg.c

+1
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ PHP_FUNCTION(phpdbg_clear)
370370
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE_OPLINE]);
371371
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE]);
372372
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]);
373+
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP]);
373374
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]);
374375
} /* }}} */
375376

sapi/phpdbg/tests/gh15208.phpt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
GH-15208 (Segfault with breakpoint map and phpdbg_clear())
3+
--PHPDBG--
4+
r
5+
q
6+
--FILE--
7+
<?php
8+
phpdbg_break_method("foo", "bar");
9+
phpdbg_clear();
10+
?>
11+
--EXPECTF--
12+
[Successful compilation of %s]
13+
prompt> [Breakpoint #0 added at foo::bar]
14+
[Script ended normally]
15+
prompt>

0 commit comments

Comments
 (0)