Skip to content

Fix GH-18112: NULL access with preloading and INI option #18117

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.

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
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions ext/opcache/ZendAccelerator.c
Original file line number Diff line number Diff line change
Expand Up @@ -4662,6 +4662,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;
Expand Down
Loading