Merge branch 'PHP-7.4'

* PHP-7.4:
  Partial fixed bug #79649 (Altering disable_functions from module init corrupts memory)

1 files changed, 11 insertions, 9 deletions

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 279dcae03c..830de07233 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -335,15 +335,17 @@ ZEND_API int zend_alter_ini_entry_ex(zend_string *name, zend_string *new_value,
 		}
 	}
 
-	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 (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);
+		}
 	}
 
 	duplicate = zend_string_copy(new_value);