Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 17e313ee6202 · 2024-08-29T16:46:56.000+03:00
* PHP-8.2: Fix GH-15497: Opcache with file_cache and JIT enabled crashes (#15635)
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -692,7 +692,10 @@ static void zend_persist_op_array(zval *zv)
 			}
 		}
 #ifdef HAVE_JIT
-		if (JIT_G(on) && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS) {
+		if (JIT_G(on)
+		 && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS
+		 && (!ZCG(current_persistent_script)
+		  || !ZCG(current_persistent_script)->corrupted)) {
 			zend_jit_op_array(op_array, ZCG(current_persistent_script) ? &ZCG(current_persistent_script)->script : NULL);
 		}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,10 @@ static void zend_persist_op_array(zval *zv)`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`	`#ifdef HAVE_JIT`
`695`		`- if (JIT_G(on) && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS) {`
	`695`	`+ if (JIT_G(on)`
	`696`	`+ && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS`
	`697`	`+ && (!ZCG(current_persistent_script)`
	`698`	`+ \|\| !ZCG(current_persistent_script)->corrupted)) {`
`696`	`699`	`zend_jit_op_array(op_array, ZCG(current_persistent_script) ? &ZCG(current_persistent_script)->script : NULL);`
`697`	`700`	`}`
`698`	`701`	`#endif`