Skip to content

Fix use-of-uninitialized-value in zend_get_arg_offset_by_name() #19856

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 3 commits into from
Closed

Fix use-of-uninitialized-value in zend_get_arg_offset_by_name() #19856

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c68afee
Fix use-of-uninitialized-value in zend_get_arg_offset_by_name()
iluuu1994 Sep 16, 2025
d5d29a6
Guard variadic parameter of temporary closure from populating cache slot
iluuu1994 Sep 17, 2025
e2b59ff
Fix ZEND_ACC_USER_ARG_INFO, whose value is reused for user functions
iluuu1994 Sep 17, 2025
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
9 changes: 6 additions & 3 deletions Zend/zend_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5072,9 +5072,9 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)
|| EXPECTED(fbc->common.fn_flags & ZEND_ACC_USER_ARG_INFO)) {
for (uint32_t i = 0; i < num_args; i++) {
zend_arg_info *arg_info = &fbc->op_array.arg_info[i];
zend_arg_info *arg_info = &fbc->common.arg_info[i];
if (zend_string_equals(arg_name, arg_info->name)) {
if (!fbc->op_array.refcount || !(fbc->op_array.fn_flags & ZEND_ACC_CLOSURE)) {
if (fbc->type == ZEND_USER_FUNCTION && (!fbc->op_array.refcount || !(fbc->op_array.fn_flags & ZEND_ACC_CLOSURE))) {
*cache_slot = unique_id;
*(uintptr_t *)(cache_slot + 1) = i;
}
Expand All @@ -5094,7 +5094,10 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
}

if (fbc->common.fn_flags & ZEND_ACC_VARIADIC) {
if (fbc->type == ZEND_INTERNAL_FUNCTION || !fbc->op_array.refcount || !(fbc->op_array.fn_flags & ZEND_ACC_CLOSURE)) {
if (!(fbc->common.fn_flags & ZEND_ACC_USER_ARG_INFO)
&& (fbc->type == ZEND_INTERNAL_FUNCTION
|| !fbc->op_array.refcount
|| !(fbc->op_array.fn_flags & ZEND_ACC_CLOSURE))) {
*cache_slot = unique_id;
*(uintptr_t *)(cache_slot + 1) = fbc->common.num_args;
}
Expand Down
Loading