From aaf388c15c8e89f6011511c4f5f0de68f5f6a55d Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Thu, 12 Jan 2023 11:55:14 +0000
Subject: [PATCH] Fix ASAN reported leak in FPM config test

---
 sapi/fpm/fpm/fpm_main.c                             | 3 ++-
 sapi/fpm/tests/bug68591-conf-test-group.phpt        | 1 +
 sapi/fpm/tests/bug68591-conf-test-listen-group.phpt | 1 +
 sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index c5972f10d1800..0a61abacd70df 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1798,7 +1798,8 @@ consult the installation file that came with this distribution, or visit \n\
 			zend_quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
 			close(fpm_globals.send_config_pipe[1]);
 		}
-		return FPM_EXIT_CONFIG;
+		exit_status = FPM_EXIT_CONFIG;
+		goto out;
 	}
 
 	if (fpm_globals.send_config_pipe[1]) {
diff --git a/sapi/fpm/tests/bug68591-conf-test-group.phpt b/sapi/fpm/tests/bug68591-conf-test-group.phpt
index 14d6390801163..d496d0549e87f 100644
--- a/sapi/fpm/tests/bug68591-conf-test-group.phpt
+++ b/sapi/fpm/tests/bug68591-conf-test-group.phpt
@@ -14,6 +14,7 @@ $cfg = <<<EOT
 error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
+user = root
 group = aaaaaa
 pm = dynamic
 pm.max_children = 5
diff --git a/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt b/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
index a98f32aa40a6c..71ca71adf8316 100644
--- a/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
+++ b/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
@@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
 listen.group = aaaaaa
+user = root
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2
diff --git a/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt b/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
index e649117026750..c6108bcddeb68 100644
--- a/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
+++ b/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
@@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
 listen.owner = aaaaaa
+user = root
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2