Fix ASAN reported leak in FPM config test

This happens because config test does not shutdown SAPI. In addition this commit also fixes few failures when running FPM tests under root. Closes GH-10296
php · Jan 12, 2023 · 1b48a5c · 1b48a5c
1 parent c936c02
commit 1b48a5c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,7 @@ PHP                                                                        NEWS
     (Jakub Zelenka)
   . Fixed bug #68591 (Configuration test does not perform UID lookups).
     (Jakub Zelenka)
+  . Fixed memory leak when running FPM config test. (Jakub Zelenka)
 
 - LDAP:
   . Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).

diff --git 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
@@ -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
@@ -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
@@ -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