Merge branch 'PHP-8.3' into PHP-8.4

iluuu1994 · iluuu1994 · commit ac42a8de75b4 · 2025-01-28T12:55:55.000+01:00
* PHP-8.3:
  Fix missing GC_PERSISTENT_LOCAL flag on accel_globals.key
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -2953,6 +2953,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
 #endif
 	memset(accel_globals, 0, sizeof(zend_accel_globals));
 	accel_globals->key = zend_string_alloc(ZCG_KEY_LEN, true);
+	GC_MAKE_PERSISTENT_LOCAL(accel_globals->key);
 }
 
 #ifdef ZTS

Original file line number	Diff line number	Diff line change
`@@ -2953,6 +2953,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)`
`2953`	`2953`	`#endif`
`2954`	`2954`	`memset(accel_globals, 0, sizeof(zend_accel_globals));`
`2955`	`2955`	`accel_globals->key = zend_string_alloc(ZCG_KEY_LEN, true);`
	`2956`	`+ GC_MAKE_PERSISTENT_LOCAL(accel_globals->key);`
`2956`	`2957`	`}`
`2957`	`2958`
`2958`	`2959`	`#ifdef ZTS`