1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix GH-18112: NULL access with preloading and INI option
This commit is contained in:
Niels Dossche
2025-03-20 19:12:53 +01:00

View File

@@ -4796,6 +4796,11 @@ static zend_result accel_finish_startup_preload(bool in_child)
EG(class_table) = NULL;
EG(function_table) = NULL;
PG(report_memleaks) = orig_report_memleaks;
#ifdef ZTS
/* Reset the virtual CWD state back to the original state created by virtual_cwd_startup().
* This is necessary because the normal startup code assumes the CWD state is active. */
virtual_cwd_activate();
#endif
} else {
zend_shared_alloc_unlock();
ret = FAILURE;