php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-15208: Segfault with breakpoint map and phpdbg_clear()
This commit is contained in:
Niels Dossche
2024-11-26 22:27:35 +01:00
parent 0d8c5ade72 3c3ec0e61a
commit 5ff67f8720
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -25,6 +25,10 @@ PHP NEWS
. Fixed bug GH-16879 (JIT dead code skipping does not update call_level).
(nielsdos)
- PHPDBG:
. Fixed bug GH-15208 (Segfault with breakpoint map and phpdbg_clear()).
(nielsdos)
- Windows:
. Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
. Windows Server 2025 is now properly reported. (cmb)

1
sapi/phpdbg/phpdbg.c
View File

@@ -370,6 +370,7 @@ PHP_FUNCTION(phpdbg_clear)
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE_OPLINE]);
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE]);
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]);
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP]);
zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]);
} /* }}} */

15
sapi/phpdbg/tests/gh15208.phpt Normal file
View File

@@ -0,0 +1,15 @@
--TEST--
GH-15208 (Segfault with breakpoint map and phpdbg_clear())
--PHPDBG--
r
q
--FILE--
<?php
phpdbg_break_method("foo", "bar");
phpdbg_clear();
?>
--EXPECTF--
[Successful compilation of %s]
prompt> [Breakpoint #0 added at foo::bar]
[Script ended normally]
prompt>