Skip to content

Fix phpdbg over-read watching an element of a packed array #22756

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

Open
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −0
Open

Fix phpdbg over-read watching an element of a packed array #22756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions sapi/phpdbg/phpdbg_watch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,32 @@ void phpdbg_check_watchpoint(phpdbg_watchpoint_t *watch) {
default:
comparePtr = &watch->backup;
}
if (watch->type == WATCH_ON_BUCKET) {
phpdbg_watch_element *first = NULL;
ZEND_HASH_MAP_FOREACH_PTR(&watch->elements, first) {
break;
} ZEND_HASH_FOREACH_END();
if (first && first->parent_container && HT_IS_PACKED(first->parent_container)) {
zval *new = zend_symtable_find(first->parent_container, first->name_in_parent);
if (!new || Z_TYPE_P(new) == IS_UNDEF) {
phpdbg_remove_watchpoint(watch);
return;
}
if (new != watch->addr.zv) {
phpdbg_remove_watchpoint_btree(watch);
phpdbg_deactivate_watchpoint(watch);
watch->addr.zv = new;
phpdbg_store_watchpoint_btree(watch);
phpdbg_activate_watchpoint(watch);
}
if (!phpdbg_check_watch_diff(WATCH_ON_ZVAL, &watch->backup.bucket.val, watch->addr.ptr)) {
phpdbg_watch_backup_data(watch);
return;
}
goto changed;
}
}

if (!phpdbg_check_watch_diff(watch->type, comparePtr, watch->addr.ptr)) {
return;
}
Expand Down Expand Up @@ -1162,6 +1188,7 @@ void phpdbg_check_watchpoint(phpdbg_watchpoint_t *watch) {
}
}

changed:
name = phpdbg_watchpoint_change_collision_name(watch);

if (name) {
Expand Down
Loading