ext/pcntl: use RETURN_THROWS() instead of RETURN_FALSE when exception is pending

In pcntl_sigprocmask(), pcntl_sigwaitinfo(), and pcntl_sigtimedwait().

Author: devnexen

ext/pcntl/pcntl.c

@@ -934,6 +934,9 @@ PHP_FUNCTION(pcntl_sigprocmask)
 	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 2, /* allow_empty_signal_array */ how == SIG_SETMASK);
 	/* Some error occurred */
 	if (!status) {
+		if (EG(exception)) {
+			RETURN_THROWS();
+		}
 		RETURN_FALSE;
 	}
 
@@ -982,6 +985,9 @@ PHP_FUNCTION(pcntl_sigwaitinfo)
 	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1, /* allow_empty_signal_array */ false);
 	/* Some error occurred */
 	if (!status) {
+		if (EG(exception)) {
+			RETURN_THROWS();
+		}
 		RETURN_FALSE;
 	}
 
@@ -1028,6 +1034,9 @@ PHP_FUNCTION(pcntl_sigtimedwait)
 	bool status = php_pcntl_set_user_signal_infos(user_set, &set, 1, /* allow_empty_signal_array */ false);
 	/* Some error occurred */
 	if (!status) {
+		if (EG(exception)) {
+			RETURN_THROWS();
+		}
 		RETURN_FALSE;
 	}
 	if (tv_sec < 0) {

ext/pcntl/tests/pcntl_signal_functions_return_throws.phpt

@@ -0,0 +1,80 @@
+--TEST--
+pcntl_sigprocmask(), pcntl_sigwaitinfo(), and pcntl_sigtimedwait() properly throw on invalid signals
+--EXTENSIONS--
+pcntl
+--SKIPIF--
+<?php
+if (!function_exists("pcntl_sigprocmask")) die("skip pcntl_sigprocmask() not available");
+if (!function_exists("pcntl_sigwaitinfo")) die("skip pcntl_sigwaitinfo() not available");
+if (!function_exists("pcntl_sigtimedwait")) die("skip pcntl_sigtimedwait() not available");
+?>
+--INI--
+max_execution_time=0
+--FILE--
+<?php
+
+try {
+    pcntl_sigprocmask(SIG_BLOCK, ["not_a_signal"]);
+} catch (TypeError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigprocmask(SIG_BLOCK, [0]);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigprocmask(SIG_BLOCK, []);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigwaitinfo(["not_a_signal"]);
+} catch (TypeError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigwaitinfo([0]);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigwaitinfo([]);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigtimedwait(["not_a_signal"], $info, 1);
+} catch (TypeError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigtimedwait([0], $info, 1);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+    pcntl_sigtimedwait([], $info, 1);
+} catch (ValueError $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+?>
+--EXPECTF--
+pcntl_sigprocmask(): Argument #2 ($signals) signals must be of type int, string given
+pcntl_sigprocmask(): Argument #2 ($signals) signals must be between 1 and %d
+pcntl_sigprocmask(): Argument #2 ($signals) must not be empty
+pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be of type int, string given
+pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d
+pcntl_sigwaitinfo(): Argument #1 ($signals) must not be empty
+pcntl_sigtimedwait(): Argument #1 ($signals) signals must be of type int, string given
+pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d
+pcntl_sigtimedwait(): Argument #1 ($signals) must not be empty