Skip to content

Fix GH-21411: opcache_compile_file() fails to early-bind classes without parents #21412

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
rlerdorf wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+6 −0
Open

Fix GH-21411: opcache_compile_file() fails to early-bind classes without parents #21412

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
6 changes: 6 additions & 0 deletions ext/opcache/zend_accelerator_util_funcs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,12 @@ static void zend_accel_do_delayed_early_binding(
: NULL;
if (parent_ce || (orig_ce->ce_flags & ZEND_ACC_LINKED)) {
ce = zend_try_early_bind(orig_ce, parent_ce, early_binding->lcname, zv);
} else if (ZSTR_LEN(early_binding->lc_parent_name) == 0) {
/* Parentless class: use the same binding path as the VM handler */
zval lcname_zv[2];
ZVAL_STR(&lcname_zv[0], early_binding->lcname);
ZVAL_STR(&lcname_zv[1], early_binding->rtd_key);
ce = zend_bind_class_in_slot(zv, lcname_zv, early_binding->lc_parent_name);
}
}
if (ce && early_binding->cache_slot != (uint32_t) -1) {
Expand Down
Loading