Merge ~athos-ribeiro/ubuntu/+source/php8.2:lp2057576-sigsegv into ubuntu/+source/php8.2:ubuntu/mantic-devel

[Athos Ribeiro]

Simple fix (upstream oneliner) for LP: #2057576

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp2054621-php-fpm-segfault/+packages

I will upload MPs for jammy and focal as soon as I get an ack on this one.

The SRU paperwork is still pending as well.

[Bryce Harrington (bryce)]

LGTM, quite a think-o. If the pointer is NULL, dereference it in the error message. Doh!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce, uploaded.

diff --git a/debian/changelog b/debian/changelog
index 83f6221..32e101c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php8.2 (8.2.10-2ubuntu2) mantic; urgency=medium
+
+  * d/p/0048-Fix-segfault-in-fpm_status_export_to_zval.patch: fix segmentation
+    fault in fpm_status_export_to_zval. (LP: #2057576)
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 26 Mar 2024 11:21:53 -0300
+
 php8.2 (8.2.10-2ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index 0842a11..623ba25 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php8.2
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP Maintainers <[e-mail]>
 Uploaders: Ondřej Surý <[e-mail]>,
            Lior Kaplan <[e-mail]>
 Build-Depends: apache2-dev (>= 2.4),
diff --git a/debian/control.in b/debian/control.in
index a1b677b..a2b86e1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: php@PHP_VERSION@
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP Maintainers <[e-mail]>
 Uploaders: Ondřej Surý <[e-mail]>,
            Lior Kaplan <[e-mail]>
 Build-Depends: apache2-dev (>= 2.4),
diff --git a/debian/patches/0048-Fix-segfault-in-fpm_status_export_to_zval.patch b/debian/patches/0048-Fix-segfault-in-fpm_status_export_to_zval.patch
new file mode 100644
index 0000000..e3a7d9d
--- /dev/null
+++ b/debian/patches/0048-Fix-segfault-in-fpm_status_export_to_zval.patch
@@ -0,0 +1,29 @@
+From df259f88daaf7df5673fd78a0a1b76a1d831d0a2 Mon Sep 17 00:00:00 2001
+From: Patrick Prasse <[e-mail]>
+Date: Fri, 17 Nov 2023 16:32:23 +0000
+Subject: [PATCH] Fix bug GH-12705: Segmentation fault in fpm_status_export_to_zval
+
+Closes GH-12706
+
+Bug: https://github.com/php/php-src/issues/12705
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php7.4/+bug/2057576
+Last-update: 2024-03-26
+Origin: upstream, https://github.com/php/php-src/commit/df259f88daaf7df5673fd78a0a1b76a1d831d0a2
+---
+ NEWS                      | 4 ++++
+ sapi/fpm/fpm/fpm_status.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
+index f0d869444afce..f698753cf4c65 100644
+--- 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;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e5ddce6..305dddf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@
 0045-scripts-php-.in-Explicitly-define-the-path-to-sed.patch
 0046-Remove-timestamps-from-phar.patch
 0047-Disable-garbage-collection-routine.patch
+0048-Fix-segfault-in-fpm_status_export_to_zval.patch