Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-13232: Segmentation fault will be reported when JIT is off but JIT_debug is still on

Author: nielsdos

NEWS

@@ -28,6 +28,8 @@ PHP                                                                        NEWS
 - Opcache:
   . Fixed bug GH-13145 (strtok() is not comptime). (ilutov)
   . Fixed type inference of range(). (ilutov)
+  . Fixed bug GH-13232 (Segmentation fault will be reported when JIT is off but
+    JIT_debug is still on). (nielsdos)
 
 - OpenSSL:
   . Fixed LibreSSL undefined reference when OPENSSL_NO_ENGINE not set.

ext/opcache/jit/zend_jit.c

@@ -5054,7 +5054,7 @@ ZEND_EXT_API int zend_jit_startup(void *buf, size_t size, bool reattached)
 
 ZEND_EXT_API void zend_jit_shutdown(void)
 {
-	if (JIT_G(debug) & ZEND_JIT_DEBUG_SIZE) {
+	if (JIT_G(debug) & ZEND_JIT_DEBUG_SIZE && dasm_ptr != NULL) {
 		fprintf(stderr, "\nJIT memory usage: %td\n", (ptrdiff_t)((char*)*dasm_ptr - (char*)dasm_buf));
 	}
 

ext/opcache/tests/jit/gh13232.phpt

@@ -0,0 +1,13 @@
+--TEST--
+GH-13232 (Segmentation fault will be reported when JIT is off but JIT_debug is still on)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.jit=disable
+opcache.jit_debug=0xfffff
+--FILE--
+<?php
+echo "Done\n";
+?>
+--EXPECT--
+Done