Skip to content

Fix GH-15901: phpdbg: Assertion failure on i funcs #15929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix GH-15901: phpdbg: Assertion failure on i funcs #15929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4902687
Fix GH-15901: phpdbg: Assertion failure on `i funcs`
cmb69 Sep 16, 2024
fe95e68
Check for HT_IS_INITIALIZED() instead of HT_IS_PACKED()
cmb69 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions sapi/phpdbg/phpdbg_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,27 +399,29 @@ PHPDBG_INFO(classes) /* {{{ */
phpdbg_notice("User Classes (%d)", zend_hash_num_elements(&classes));

/* once added, assume that classes are stable... until shutdown. */
ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
phpdbg_print_class_name(ce);

if (ce->parent) {
if (ce->ce_flags & ZEND_ACC_LINKED) {
zend_class_entry *pce = ce->parent;
do {
phpdbg_out("|-------- ");
phpdbg_print_class_name(pce);
} while ((pce = pce->parent));
} else {
phpdbg_writeln("|-------- User Class %s (not yet linked because declaration for parent was not encountered when declaring the class)", ZSTR_VAL(ce->parent_name));
if (HT_IS_INITIALIZED(&classes)) {
ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
phpdbg_print_class_name(ce);

if (ce->parent) {
if (ce->ce_flags & ZEND_ACC_LINKED) {
zend_class_entry *pce = ce->parent;
do {
phpdbg_out("|-------- ");
phpdbg_print_class_name(pce);
} while ((pce = pce->parent));
} else {
phpdbg_writeln("|-------- User Class %s (not yet linked because declaration for parent was not encountered when declaring the class)", ZSTR_VAL(ce->parent_name));
}
}
}

if (ce->info.user.filename) {
phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
} else {
phpdbg_writeln("|---- no source code");
}
} ZEND_HASH_FOREACH_END();
if (ce->info.user.filename) {
phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
} else {
phpdbg_writeln("|---- no source code");
}
} ZEND_HASH_FOREACH_END();
}

zend_hash_destroy(&classes);

Expand All @@ -445,17 +447,19 @@ PHPDBG_INFO(funcs) /* {{{ */

phpdbg_notice("User Functions (%d)", zend_hash_num_elements(&functions));

ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
zend_op_array *op_array = &zf->op_array;
if (HT_IS_INITIALIZED(&functions)) {
ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
zend_op_array *op_array = &zf->op_array;

phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");
phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");

if (op_array->filename) {
phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
} else {
phpdbg_writeln(" (no source code)");
}
} ZEND_HASH_FOREACH_END();
if (op_array->filename) {
phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
} else {
phpdbg_writeln(" (no source code)");
}
} ZEND_HASH_FOREACH_END();
}

zend_hash_destroy(&functions);

Expand Down
10 changes: 10 additions & 0 deletions sapi/phpdbg/tests/gh15901.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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