Skip to content

Commit 66996b2

Browse files
committed
Revert "Partial fixed bug #79649 (Altering disable_functions from module init corrupts memory)"
This reverts commit a297c09.
1 parent 31821e5 commit 66996b2

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Zend/zend_ini.c

+9-11
Original file line numberDiff line numberDiff line change
@@ -341,17 +341,15 @@ ZEND_API int zend_alter_ini_entry_ex(zend_string *name, zend_string *new_value,
341341
}
342342
}
343343

344-
if (ini_entry->modifiable != ZEND_INI_SYSTEM) {
345-
if (!EG(modified_ini_directives)) {
346-
ALLOC_HASHTABLE(EG(modified_ini_directives));
347-
zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0);
348-
}
349-
if (!modified) {
350-
ini_entry->orig_value = ini_entry->value;
351-
ini_entry->orig_modifiable = modifiable;
352-
ini_entry->modified = 1;
353-
zend_hash_add_ptr(EG(modified_ini_directives), ini_entry->name, ini_entry);
354-
}
344+
if (!EG(modified_ini_directives)) {
345+
ALLOC_HASHTABLE(EG(modified_ini_directives));
346+
zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0);
347+
}
348+
if (!modified) {
349+
ini_entry->orig_value = ini_entry->value;
350+
ini_entry->orig_modifiable = modifiable;
351+
ini_entry->modified = 1;
352+
zend_hash_add_ptr(EG(modified_ini_directives), ini_entry->name, ini_entry);
355353
}
356354

357355
duplicate = zend_string_copy(new_value);

0 commit comments

Comments
 (0)