Merge branch 'PHP-8.5'

iluuu1994 · iluuu1994 · commit 4227106f3719 · 2025-11-11T01:45:29.000+01:00
* PHP-8.5: Commit the actual fix for GH-17951
diff --git a/main/main.c b/main/main.c
@@ -350,7 +350,7 @@ static PHP_INI_MH(OnChangeMemoryLimit)
 		}
 
 		zend_ini_entry *max_mem_limit_ini = zend_hash_str_find_ptr(EG(ini_directives), ZEND_STRL("max_memory_limit"));
-		entry->value = zend_string_copy(max_mem_limit_ini->value);
+		entry->value = zend_string_init(ZSTR_VAL(max_mem_limit_ini->value), ZSTR_LEN(max_mem_limit_ini->value), true);
 		PG(memory_limit) = PG(max_memory_limit);
 
 		return SUCCESS;

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ static PHP_INI_MH(OnChangeMemoryLimit)`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`zend_ini_entry *max_mem_limit_ini = zend_hash_str_find_ptr(EG(ini_directives), ZEND_STRL("max_memory_limit"));`
`353`		`- entry->value = zend_string_copy(max_mem_limit_ini->value);`
	`353`	`+ entry->value = zend_string_init(ZSTR_VAL(max_mem_limit_ini->value), ZSTR_LEN(max_mem_limit_ini->value), true);`
`354`	`354`	`PG(memory_limit) = PG(max_memory_limit);`
`355`	`355`
`356`	`356`	`return SUCCESS;`