Fix leak of accel_globals->key

nielsdos · nielsdos · commit db3bf715e0d5 · 2025-05-19T19:34:16.000+02:00
I don't know why this was guarded with ZTS, but it leaks on this test (and a few more): `./sapi/cli/php ./run-tests.php -c . --show-diff sapi/phpdbg/tests/stdin_001.phpt` Closes GH-18593.
diff --git a/NEWS b/NEWS
@@ -43,6 +43,7 @@ PHP                                                                        NEWS
     failure). (nielsdos)
   . Fixed bug GH-18534 (FPM exit code 70 with enabled opcache and hooked
     properties in traits). (nielsdos)
+  . Fix leak of accel_globals->key. (nielsdos)
 
 - SPL:
   . Fixed bug GH-18421 (Integer overflow with large numbers in LimitIterator).
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -2964,9 +2964,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
`@@ -2964,9 +2964,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)`
`2964`	`2964`
`2965`	`2965`	`static void accel_globals_dtor(zend_accel_globals *accel_globals)`
`2966`	`2966`	`{`
`2967`		`-#ifdef ZTS`
`2968`	`2967`	`zend_string_free(accel_globals->key);`
`2969`		`-#endif`
`2970`	`2968`	`if (accel_globals->preloaded_internal_run_time_cache) {`
`2971`	`2969`	`pefree(accel_globals->preloaded_internal_run_time_cache, 1);`
`2972`	`2970`	`}`