Merge branch 'PHP-8.2' into PHP-8.3

bukka · bukka · commit c74fc4c5b0d3 · 2023-12-01T14:47:57.000Z
diff --git a/NEWS b/NEWS
@@ -7,6 +7,10 @@ PHP                                                                        NEWS
     ZEND_FUNC_GET_ARGS and ZEND_BIND_STATIC). (Florian Engelhardt)
   . Fix various missing NULL checks. (nielsdos, dstogov)
 
+- FPM:
+  . Fixed bug GH-12705 (Segmentation fault in fpm_status_export_to_zval).
+    (Patrick Prasse)
+
 - LibXML:
   . Fixed test failures for libxml2 2.12.0. (nielsdos)
 
diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
@@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)
 
 	scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
 	if (!scoreboard_p) {
-		zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);
+		zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");
 		return -1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)`
`56`	`56`
`57`	`57`	`scoreboard_p = fpm_scoreboard_acquire(NULL, 1);`
`58`	`58`	`if (!scoreboard_p) {`
`59`		`- zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);`
	`59`	`+ zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");`
`60`	`60`	`return -1;`
`61`	`61`	`}`
`62`	`62`