Skip to content

Fix memory corruption of INIs in ZTS builds #3898

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

Open
bwoebi wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −1
Open

Fix memory corruption of INIs in ZTS builds #3898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87e3b2d
Fix memory corruption of INIs in ZTS builds
bwoebi May 21, 2026
7d1d633
Update zend_abstract_interface/config/config_ini.c
realFlowControl May 22, 2026
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: 4 additions & 1 deletion zend_abstract_interface/config/config_ini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void zai_config_ini_rinit(void) {

#if ZTS
// Skip during preloading, in that case EG(ini_directives) is the actual source of truth (NTS-like)
if (env_to_ini_name && !inis_synchronized && zai_config_first_rinit_done) {
if (env_to_ini_name && !inis_synchronized && zai_config_first_rinit_done && !in_startup) {
for (uint16_t i = 0; i < zai_config_memoized_entries_count; ++i) {
zai_config_memoized_entry *memoized = &zai_config_memoized_entries[i];
if (!memoized->original_on_modify) {
Expand All @@ -405,6 +405,9 @@ void zai_config_ini_rinit(void) {
zend_ini_entry *source = memoized->ini_entries[n],
*ini = zend_hash_find_ptr(EG(ini_directives), source->name);
// On ZTS INIs must be not shared between threads (otherwise: refcount race conditions). Hence we dup them rather than just copy.
ZEND_ASSERT(ini && source);
ZEND_ASSERT(ini != source && "ZTS INI sync must not run against the global INI table");
ZEND_ASSERT(ini->value != source->value && "ZTS INI values must not be shared before syncing");
if (ini->modified) {
bool identical_orig = ini->orig_value == ini->value;
zend_string_release(ini->orig_value);
Expand Down
Loading