Merge branch 'PHP-8.4'

ndossche · ndossche · commit 146157ddf0fb · 2025-05-19T19:34:27.000+02:00
* PHP-8.4:
  Fix leak of accel_globals-&gt;key
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -2977,9 +2977,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
 
 static void accel_globals_dtor(zend_accel_globals *accel_globals)
 {
-#ifdef ZTS
 	zend_string_free(accel_globals->key);
-#endif
 	if (accel_globals->preloaded_internal_run_time_cache) {
 		pefree(accel_globals->preloaded_internal_run_time_cache, 1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2977,9 +2977,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)`
`2977`	`2977`
`2978`	`2978`	`static void accel_globals_dtor(zend_accel_globals *accel_globals)`
`2979`	`2979`	`{`
`2980`		`-#ifdef ZTS`
`2981`	`2980`	`zend_string_free(accel_globals->key);`
`2982`		`-#endif`
`2983`	`2981`	`if (accel_globals->preloaded_internal_run_time_cache) {`
`2984`	`2982`	`pefree(accel_globals->preloaded_internal_run_time_cache, 1);`
`2985`	`2983`	`}`