mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix GH-15901: phpdbg: Assertion failure on `i funcs`
This commit is contained in:
commit
c76913fde0
3 changed files with 44 additions and 27 deletions
3
NEWS
3
NEWS
|
@ -2,6 +2,9 @@ PHP NEWS
|
|||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
?? ??? ????, PHP 8.3.13
|
||||
|
||||
- PHPDBG:
|
||||
. Fixed bug GH-15901 (phpdbg: Assertion failure on i funcs). (cmb)
|
||||
|
||||
- SimpleXML:
|
||||
. Fixed bug GH-15837 (Segmentation fault in ext/simplexml/simplexml.c).
|
||||
(nielsdos)
|
||||
|
|
|
@ -399,6 +399,7 @@ PHPDBG_INFO(classes) /* {{{ */
|
|||
phpdbg_notice("User Classes (%d)", zend_hash_num_elements(&classes));
|
||||
|
||||
/* once added, assume that classes are stable... until shutdown. */
|
||||
if (HT_IS_INITIALIZED(&classes)) {
|
||||
ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
|
||||
phpdbg_print_class_name(ce);
|
||||
|
||||
|
@ -420,6 +421,7 @@ PHPDBG_INFO(classes) /* {{{ */
|
|||
phpdbg_writeln("|---- no source code");
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
}
|
||||
|
||||
zend_hash_destroy(&classes);
|
||||
|
||||
|
@ -445,6 +447,7 @@ PHPDBG_INFO(funcs) /* {{{ */
|
|||
|
||||
phpdbg_notice("User Functions (%d)", zend_hash_num_elements(&functions));
|
||||
|
||||
if (HT_IS_INITIALIZED(&functions)) {
|
||||
ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
|
||||
zend_op_array *op_array = &zf->op_array;
|
||||
|
||||
|
@ -456,6 +459,7 @@ PHPDBG_INFO(funcs) /* {{{ */
|
|||
phpdbg_writeln(" (no source code)");
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
}
|
||||
|
||||
zend_hash_destroy(&functions);
|
||||
|
||||
|
|
10
sapi/phpdbg/tests/gh15901.phpt
Normal file
10
sapi/phpdbg/tests/gh15901.phpt
Normal file
|
@ -0,0 +1,10 @@
|
|||
--TEST--
|
||||
GH-15901 (phpdbg: Assertion failure on `i funcs`)
|
||||
--PHPDBG--
|
||||
i funcs
|
||||
i classes
|
||||
--EXPECT--
|
||||
prompt> [User Functions (0)]
|
||||
prompt> [User Classes (0)]
|
||||
prompt> [User Classes (0)]
|
||||
prompt>
|
Loading…
Add table
Add a link
Reference in a new issue