Fixed bug #80422 (php_opcache.dll crashes when using Apache 2.4 with JIT)

dstogov · dstogov · commit 3edf5c969a9f · 2021-01-14T08:16:27.000+03:00
diff --git a/NEWS b/NEWS
@@ -39,6 +39,10 @@ PHP                                                                        NEWS
 - ODBC:
   . Fixed bug #80592 (all floats are the same in ODBC parameters). (cmb)
 
+- Opcache:
+  . Fixed bug #80422 (php_opcache.dll crashes when using Apache 2.4 with JIT).
+    (Dmitry)
+
 - PDO_Firebird:
   . Fixed bug #80521 (Parameters with underscores no longer recognized). (cmb,
     Simonov Denis)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -7629,6 +7629,11 @@ static void zend_jit_trace_init_caches(void)
 static void zend_jit_trace_reset_caches(void)
 {
 	JIT_G(tracing) = 0;
+#ifdef ZTS
+	if (!JIT_G(exit_counters)) {
+		JIT_G(exit_counters) = calloc(JIT_G(max_exit_counters), 1);
+	}
+#endif
 }
 
 static void zend_jit_trace_restart(void)

Original file line number	Diff line number	Diff line change
`@@ -7629,6 +7629,11 @@ static void zend_jit_trace_init_caches(void)`
`7629`	`7629`	`static void zend_jit_trace_reset_caches(void)`
`7630`	`7630`	`{`
`7631`	`7631`	`JIT_G(tracing) = 0;`
	`7632`	`+#ifdef ZTS`
	`7633`	`+ if (!JIT_G(exit_counters)) {`
	`7634`	`+ JIT_G(exit_counters) = calloc(JIT_G(max_exit_counters), 1);`
	`7635`	`+ }`
	`7636`	`+#endif`
`7632`	`7637`	`}`
`7633`	`7638`
`7634`	`7639`	`static void zend_jit_trace_restart(void)`