Skip to content

Fix GH-25253: JIT reads parent of an unlinked class #25259

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
lazerg wants to merge 1 commit into from
Closed

Fix GH-25253: JIT reads parent of an unlinked class #25259

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ext/opcache/jit/zend_jit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ static zend_class_entry* zend_get_known_class(const zend_op_array *op_array, con
ZEND_ASSERT((op.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT);
ce = op_array->scope;
if (ce) {
if (ce->parent) {
if ((ce->ce_flags & ZEND_ACC_LINKED) && ce->parent) {
ce = ce->parent;
if (ce->type == ZEND_INTERNAL_CLASS || ce->info.user.filename != op_array->filename) {
ce = NULL;
Expand Down
10 changes: 10 additions & 0 deletions ext/opcache/tests/jit/gh25253.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

class GH25253Child extends GH25253ParentClass {
public function m0() { return parent::m0(); }
public function m1() { return parent::m1(); }
public function m2() { return parent::m2(); }
public function m3() { return parent::m3(); }
public function m4() { return parent::m4(); }
public function m5() { return parent::m5(); }
}
30 changes: 30 additions & 0 deletions ext/opcache/tests/jit/gh25253.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
GH-25253: JIT reads parent of an unlinked class
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.interned_strings_buffer=0
opcache.jit=function
--EXTENSIONS--
opcache
--FILE--
<?php

class GH25253ParentClass {
public function m0() { return 'm0'; }
public function m1() { return 'm1'; }
public function m2() { return 'm2'; }
public function m3() { return 'm3'; }
public function m4() { return 'm4'; }
public function m5() { return 'm5'; }
}

require __DIR__ . '/gh25253.inc';

$c = new GH25253Child;
echo $c->m0(), $c->m5(), "\n";

?>
--EXPECT--
m0m5
Loading