Skip to content

Fix GH-13433: Segmentation Fault in zend_class_init_statics when using opcache.preload #13794

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 1 commit into from
Closed

Fix GH-13433: Segmentation Fault in zend_class_init_statics when using opcache.preload #13794

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
4 changes: 4 additions & 0 deletions ext/opcache/tests/gh13433/ParentClass.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php
abstract class ParentClass {
use TraitA;
}
8 changes: 8 additions & 0 deletions ext/opcache/tests/gh13433/TheClass.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php
class TheClass extends ParentClass {
use TraitA;

public function test() {
return self::$non_empty_array;
}
}
4 changes: 4 additions & 0 deletions ext/opcache/tests/gh13433/TraitA.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php
trait TraitA {
protected static $non_empty_array = ['non-empty'];
}
32 changes: 32 additions & 0 deletions ext/opcache/tests/gh13433/gh13433.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
GH-13433 (Segmentation Fault in zend_class_init_statics when using opcache.preload)
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=0
opcache.preload={PWD}/preload.inc
--EXTENSIONS--
opcache
--SKIPIF--
<?php
if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
?>
--FILE--
<?php
require __DIR__.'/TraitA.inc';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this included again? Shouldn't preloading take care of this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking the PR.
You are right, this is not necessary, I don't remember why I did this. I checked to be sure: PHP without this PR still reproduces the case without these includes.

require __DIR__.'/ParentClass.inc';
require __DIR__.'/TheClass.inc';

$instance = new TheClass;
var_dump($instance);
var_dump($instance->test());
?>
OK
--EXPECT--
object(TheClass)#1 (0) {
}
array(1) {
[0]=>
string(9) "non-empty"
}
OK
4 changes: 4 additions & 0 deletions ext/opcache/tests/gh13433/preload.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php
require __DIR__.'/TraitA.inc';
require __DIR__.'/ParentClass.inc';
require __DIR__.'/TheClass.inc';
9 changes: 5 additions & 4 deletions ext/opcache/zend_persist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,10 +903,11 @@ zend_class_entry *zend_persist_class_entry(zend_class_entry *orig_ce)
ce->default_static_members_table = zend_shared_memdup_free(ce->default_static_members_table, sizeof(zval) * ce->default_static_members_count);

/* Persist only static properties in this class.
* Static properties from parent classes will be handled in class_copy_ctor */
i = (ce->parent && (ce->ce_flags & ZEND_ACC_LINKED)) ? ce->parent->default_static_members_count : 0;
for (; i < ce->default_static_members_count; i++) {
zend_persist_zval(&ce->default_static_members_table[i]);
* Static properties from parent classes will be handled in class_copy_ctor and are marked with IS_INDIRECT */
for (i = 0; i < ce->default_static_members_count; i++) {
if (Z_TYPE(ce->default_static_members_table[i]) != IS_INDIRECT) {
zend_persist_zval(&ce->default_static_members_table[i]);
}
}
if (ce->ce_flags & ZEND_ACC_IMMUTABLE) {
if (ce->ce_flags & ZEND_ACC_LINKED) {
Expand Down