diff options
| author | Derick Rethans <github@derickrethans.nl> | 2020-07-09 09:48:35 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2020-07-09 09:50:25 +0100 |
| commit | 972383fda4235e8dc9f5de1bd95d30a6e2e25385 (patch) | |
| tree | 1f045add03b49e37f3950ba99a8873aeee4728cd | |
| parent | 77a8a709dae567d168d9041991f8e8cf17a4654c (diff) | |
| download | php-git-972383fda4235e8dc9f5de1bd95d30a6e2e25385.tar.gz | |
Revert "Partial fixed bug #79649 (Altering disable_functions from module init corrupts memory)"
This reverts commit a297c09da5ad355d53a8e8ea72655a06d15b7bc7.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/zend_ini.c | 20 |
2 files changed, 10 insertions, 14 deletions
@@ -44,11 +44,9 @@ PHP NEWS - Standard: . Fixed bug #70362 (Can't copy() large 'data://' with open_basedir). (cmb) -?? ??? 2020, PHP 7.4.8 +09 Jul 2020, PHP 7.4.8 - Core: - . Fixed bug #79649 (Altering disable_functions from module init corrupts - memory). (Laruence) . Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita) . Fixed bug #79650 (php-win.exe 100% cpu lockup). (cmb) . Fixed bug #79668 (get_defined_functions(true) may miss functions). (cmb, diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 3f4c9d0930..e4b9e6bc5e 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -341,17 +341,15 @@ ZEND_API int zend_alter_ini_entry_ex(zend_string *name, zend_string *new_value, } } - if (ini_entry->modifiable != ZEND_INI_SYSTEM) { - if (!EG(modified_ini_directives)) { - ALLOC_HASHTABLE(EG(modified_ini_directives)); - zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0); - } - if (!modified) { - ini_entry->orig_value = ini_entry->value; - ini_entry->orig_modifiable = modifiable; - ini_entry->modified = 1; - zend_hash_add_ptr(EG(modified_ini_directives), ini_entry->name, ini_entry); - } + if (!EG(modified_ini_directives)) { + ALLOC_HASHTABLE(EG(modified_ini_directives)); + zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0); + } + if (!modified) { + ini_entry->orig_value = ini_entry->value; + ini_entry->orig_modifiable = modifiable; + ini_entry->modified = 1; + zend_hash_add_ptr(EG(modified_ini_directives), ini_entry->name, ini_entry); } duplicate = zend_string_copy(new_value); |