Commit 4b9c72f

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Destroy temporary module classes in reverse order

2 parents 7c9872e + 1c18267 commit 4b9c72fCopy full SHA for 4b9c72f

File tree

5 files changed

+84

-14

lines changed

NEWS
Zend
- zend_API.c
ext/dl_test

5 files changed

+84

-14

lines changed

`‎NEWS‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ PHP NEWS`
`22`	`22`	`SIMPLE_WRITE cache). (ilutov)`
`23`	`23`	`. Fixed bug GH-17998 (Assignment to backing value in set hook of lazy proxy`
`24`	`24`	`calls hook again). (ilutov)`
	`25`	`+ . Fixed bug GH-17961 (use-after-free during dl()'ed module class destruction).`
	`26`	`+ (Arnaud)`
	`27`	`+ . Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).`
	`28`	`+ (Arnaud)`
`25`	`29`
`26`	`30`	`- DBA:`
`27`	`31`	`. Fixed assertion violation when opening the same file with dba_open`

`‎Zend/zend_API.c‎`

Lines changed: 10 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include "zend.h"`
`23`	`23`	`#include "zend_execute.h"`
`24`	`24`	`#include "zend_API.h"`
	`25`	`+#include "zend_hash.h"`
`25`	`26`	`#include "zend_modules.h"`
`26`	`27`	`#include "zend_extensions.h"`
`27`	`28`	`#include "zend_constants.h"`
`@@ -3263,21 +3264,17 @@ ZEND_API zend_result zend_get_module_started(const char module_name) / {{{ */`
`3263`	`3264`	`}`
`3264`	`3265`	`/* }}} */`
`3265`	`3266`
`3266`		`-static int clean_module_class(zval el, void arg) /* {{{ */`
`3267`		`-{`
`3268`		`- zend_class_entry ce = (zend_class_entry )Z_PTR_P(el);`
`3269`		`- int module_number = (int )arg;`
`3270`		`- if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == module_number) {`
`3271`		`- return ZEND_HASH_APPLY_REMOVE;`
`3272`		`- } else {`
`3273`		`- return ZEND_HASH_APPLY_KEEP;`
`3274`		`- }`
`3275`		`-}`
`3276`		`-/* }}} */`
`3277`		`-`
`3278`	`3267`	`static void clean_module_classes(int module_number) /* {{{ */`
`3279`	`3268`	`{`
`3280`		`- zend_hash_apply_with_argument(EG(class_table), clean_module_class, (void *) &module_number);`
	`3269`	`+ /* Child classes may reuse structures from parent classes, so destroy in reverse order. */`
	`3270`	`+ Bucket *bucket;`
	`3271`	`+ ZEND_HASH_REVERSE_FOREACH_BUCKET(EG(class_table), bucket) {`
	`3272`	`+ zend_class_entry *ce = Z_CE(bucket->val);`
	`3273`	`+ if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == module_number) {`
	`3274`	`+ zend_hash_del_bucket(EG(class_table), bucket);`
	`3275`	`+ }`
	`3276`	`+ } ZEND_HASH_FOREACH_END();`
	`3277`	`+`
`3281`	`3278`	`}`
`3282`	`3279`	`/* }}} */`
`3283`	`3280`

`‎ext/dl_test/dl_test.c‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,22 @@ PHP_METHOD(DlTest, test)`
`92`	`92`	`RETURN_STR(retval);`
`93`	`93`	`}`
`94`	`94`
	`95`	`+PHP_METHOD(DlTestSuperClass, test)`
	`96`	`+{`
	`97`	`+ ZEND_PARSE_PARAMETERS_NONE();`
	`98`	`+`
	`99`	`+ RETURN_NULL();`
	`100`	`+}`
	`101`	`+`
`95`	`102`	`/* {{{ PHP_MINIT_FUNCTION */`
`96`	`103`	`PHP_MINIT_FUNCTION(dl_test)`
`97`	`104`	`{`
	`105`	`+ zend_class_entry *ce;`
	`106`	`+`
`98`	`107`	`register_class_DlTest();`
	`108`	`+ ce = register_class_DlTestSuperClass();`
	`109`	`+ register_class_DlTestSubClass(ce);`
	`110`	`+ register_class_DlTestAliasedClass();`
`99`	`111`
`100`	`112`	`/* Test backwards compatibility */`
`101`	`113`	`if (getenv("PHP_DL_TEST_USE_OLD_REGISTER_INI_ENTRIES")) {`

`‎ext/dl_test/dl_test.stub.php‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,15 @@ function dl_test_test2(string $str = ""): string {}`
`12`	`12`	`class DlTest {`
`13`	`13`	`public function test(string $str = ""): string {}`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+class DlTestSuperClass {`
	`17`	`+ public int $a;`
	`18`	`+ public function test(string $str = ""): string {}`
	`19`	`+}`
	`20`	`+`
	`21`	`+class DlTestSubClass extends DlTestSuperClass {`
	`22`	`+}`
	`23`	`+`
	`24`	`+/** @alias DlTestClassAlias */`
	`25`	`+class DlTestAliasedClass {`
	`26`	`+}`

`‎ext/dl_test/dl_test_arginfo.h‎`

Lines changed: 46 additions & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4b9c72f

File tree

5 files changed

5 files changed

`‎NEWS‎`

`‎Zend/zend_API.c‎`

`‎ext/dl_test/dl_test.c‎`

`‎ext/dl_test/dl_test.stub.php‎`

`‎ext/dl_test/dl_test_arginfo.h‎`

0 commit comments