Fix test hanging

Author: Girgias

ext/pcntl/pcntl.c

@@ -715,9 +715,10 @@ PHP_FUNCTION(pcntl_signal_dispatch)
 static bool php_pcntl_set_user_signal_infos(
 	/* const */ HashTable *const user_signals,
 	sigset_t *const set,
-	size_t arg_num
+	size_t arg_num,
+	bool allow_empty_signal_array
 ) {
-	if (zend_hash_num_elements(user_signals) == 0) {
+	if (!allow_empty_signal_array && zend_hash_num_elements(user_signals) == 0) {
 		zend_argument_value_error(arg_num, "cannot be empty");
 		return false;
 	}
@@ -787,21 +788,11 @@ PHP_FUNCTION(pcntl_sigprocmask)
 	}
 
 	sigset_t set;
-	/* Can set an empty array of signals for SIG_SETMASK */
-	if (how == SIG_SETMASK && zend_hash_num_elements(user_set) == 0) {
-		if (sigemptyset(&set) != 0) {
-			PCNTL_G(last_error) = errno;
-			php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
-			RETURN_FALSE;
-		}
-		goto skip_setting_user_signals;
-	}
-	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 2);
+	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 2, /* allow_empty_signal_array */ how == SIG_SETMASK);
 	/* Some error occurred */
 	if (!status) {
 		RETURN_FALSE;
 	}
-	skip_setting_user_signals:
 
 	if (sigprocmask(how, &set, &old_set) != 0) {
 		PCNTL_G(last_error) = errno;
@@ -845,7 +836,7 @@ PHP_FUNCTION(pcntl_sigwaitinfo)
 	ZEND_PARSE_PARAMETERS_END();
 
 	sigset_t set;
-	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1);
+	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1, /* allow_empty_signal_array */ false);
 	/* Some error occurred */
 	if (!status) {
 		RETURN_FALSE;
@@ -891,7 +882,7 @@ PHP_FUNCTION(pcntl_sigtimedwait)
 	ZEND_PARSE_PARAMETERS_END();
 
 	sigset_t set;
-	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1);
+	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1, /* allow_empty_signal_array */ false);
 	/* Some error occurred */
 	if (!status) {
 		RETURN_FALSE;

ext/pcntl/tests/002.phpt

@@ -11,7 +11,6 @@ if (
     or !function_exists('pcntl_sigtimedwait')
 ) { die('skip required functionality is not available'); }
 elseif (!defined('CLD_EXITED')) die('skip CLD_EXITED not defined');
-elseif (getenv('SKIP_ASAN')) die('skip Fails intermittently under asan/msan');
 elseif (getenv("SKIP_REPEAT")) die("skip cannot be repeated");
 elseif (str_contains(PHP_OS, 'FreeBSD')) die('skip Results in parallel test runner hang on FreeBSD');
 ?>
@@ -24,7 +23,7 @@ if ($pid == -1) {
 } else if ($pid) {
     pcntl_sigprocmask(SIG_BLOCK, array(SIGCHLD,(string)SIGTERM));
     $oldset = array();
-    pcntl_sigprocmask(SIG_BLOCK, array(), $oldset);
+    pcntl_sigprocmask(SIG_UNBLOCK, array(SIGINT), $oldset);
     var_dump(in_array(SIGCHLD, $oldset));
     var_dump(in_array(SIGTERM, $oldset));
 

ext/pcntl/tests/003.phpt

@@ -10,29 +10,61 @@ if (!function_exists("pcntl_sigprocmask")) die("skip pcntl_sigprocmask() not ava
 --FILE--
 <?php
 
+const SIGNO_NAMES = [
+    SIGINT => "SIGINT",
+    SIGTERM => "SIGTERM",
+    SIGCHLD => "SIGCHLD",
+];
+
+function map_signo_to_name(int $no): string {
+    return SIGNO_NAMES[$no];
+}
+
 // Clear mask
-pcntl_sigprocmask(SIG_SETMASK, array(), $prev);
+pcntl_sigprocmask(SIG_SETMASK, [], $prev);
 
-pcntl_sigprocmask(SIG_BLOCK, array(SIGCHLD,SIGTERM), $old);
-var_dump(count($old));
-pcntl_sigprocmask(SIG_BLOCK, array(SIGINT), $old);
-var_dump(count($old));
-pcntl_sigprocmask(SIG_UNBLOCK, array(SIGINT), $old);
-var_dump(count($old));
-pcntl_sigprocmask(SIG_SETMASK, array(SIGINT), $old);
-var_dump(count($old));
-pcntl_sigprocmask(SIG_SETMASK, array(), $old);
-var_dump(count($old));
+pcntl_sigprocmask(SIG_BLOCK, [SIGCHLD, SIGTERM], $old);
+var_dump(array_map(map_signo_to_name(...), $old));
+pcntl_sigprocmask(SIG_BLOCK, [SIGINT], $old);
+var_dump(array_map(map_signo_to_name(...), $old));
+pcntl_sigprocmask(SIG_UNBLOCK, [SIGINT], $old);
+var_dump(array_map(map_signo_to_name(...), $old));
+pcntl_sigprocmask(SIG_SETMASK, [SIGINT], $old);
+var_dump(array_map(map_signo_to_name(...), $old));
+pcntl_sigprocmask(SIG_SETMASK, [], $old);
+var_dump(array_map(map_signo_to_name(...), $old));
 
 // Restore previous mask
 pcntl_sigprocmask(SIG_SETMASK, $prev, $old);
-var_dump(count($old));
+var_dump(array_map(map_signo_to_name(...), $old));
 
 ?>
 --EXPECT--
-int(0)
-int(2)
-int(3)
-int(2)
-int(1)
-int(0)
+array(0) {
+}
+array(2) {
+  [0]=>
+  string(7) "SIGTERM"
+  [1]=>
+  string(7) "SIGCHLD"
+}
+array(3) {
+  [0]=>
+  string(6) "SIGINT"
+  [1]=>
+  string(7) "SIGTERM"
+  [2]=>
+  string(7) "SIGCHLD"
+}
+array(2) {
+  [0]=>
+  string(7) "SIGTERM"
+  [1]=>
+  string(7) "SIGCHLD"
+}
+array(1) {
+  [0]=>
+  string(6) "SIGINT"
+}
+array(0) {
+}