Merge ~athos-ribeiro/ubuntu/+source/php7.4:lp2057576-sigsegv-ff into ubuntu/+source/php7.4:ubuntu/focal-devel

[Athos Ribeiro]

Simple fix (upstream oneliner) for LP: #2057576

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp2057576-sigsegv-php/+packages

[Andreas Hasenack (ahasenack)]

+1

review: Approve

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

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

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks!

Uploaded

diff --git a/debian/changelog b/debian/changelog
index 98ecbb9..b88053c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php7.4 (7.4.3-4ubuntu2.21) focal; urgency=medium
+
+  * d/p/fix-segfault-in-fpm_status_export_to_zval.patch: fix segmentation
+    fault in fpm_status_export_to_zval. (LP: #2057576)
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 10 Apr 2024 09:36:03 -0300
+
 php7.4 (7.4.3-4ubuntu2.20) focal-security; urgency=medium
 
   * SECURITY UPDATE: Disclosure sensitive information
diff --git a/debian/patches/fix-segfault-in-fpm_status_export_to_zval.patch b/debian/patches/fix-segfault-in-fpm_status_export_to_zval.patch
new file mode 100644
index 0000000..ab70b6c
--- /dev/null
+++ b/debian/patches/fix-segfault-in-fpm_status_export_to_zval.patch
@@ -0,0 +1,27 @@
+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-04-10
+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(-)
+
+--- a/sapi/fpm/fpm/fpm_status.c
++++ b/sapi/fpm/fpm/fpm_status.c
+@@ -56,7 +56,7 @@
+ 
+ 	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 9aa3af8..c533cf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -92,3 +92,4 @@ CVE-2023-3247-1.patch
 CVE-2023-3247-2.patch
 CVE-2023-3823.patch
 CVE-2023-3824.patch
+fix-segfault-in-fpm_status_export_to_zval.patch