Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions ext/pcntl/pcntl.c
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,25 @@ PHP_FUNCTION(pcntl_signal)
RETURN_THROWS();
}

if (Z_TYPE_P(handle) == IS_LONG) {
if (Z_LVAL_P(handle) != (zend_long) SIG_DFL && Z_LVAL_P(handle) != (zend_long) SIG_IGN) {
zend_argument_value_error(2, "must be either SIG_DFL or SIG_IGN when an integer value is given");
RETURN_THROWS();
}
} else if (!zend_is_callable_ex(handle, NULL, 0, NULL, NULL, NULL)) {
PCNTL_G(last_error) = EINVAL;

zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_value_name(handle));
RETURN_THROWS();
}

/* sigaction() always fails for these, and zend_sigaction() turns that into a fatal error */
if (signo == SIGKILL || signo == SIGSTOP) {
Comment thread
lacatoire marked this conversation as resolved.
Resolved
PCNTL_G(last_error) = EINVAL;
php_error_docref(NULL, E_WARNING, "Error assigning signal");
RETURN_FALSE;
}

if (!PCNTL_G(spares)) {
/* since calling malloc() from within a signal handler is not portable,
* pre-allocate a few records for recording signals */
Expand All @@ -781,10 +800,6 @@ PHP_FUNCTION(pcntl_signal)

/* Special long value case for SIG_DFL and SIG_IGN */
if (Z_TYPE_P(handle) == IS_LONG) {
if (Z_LVAL_P(handle) != (zend_long) SIG_DFL && Z_LVAL_P(handle) != (zend_long) SIG_IGN) {
zend_argument_value_error(2, "must be either SIG_DFL or SIG_IGN when an integer value is given");
RETURN_THROWS();
}
if (php_signal(signo, (Sigfunc *) Z_LVAL_P(handle), (int) restart_syscalls) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
php_error_docref(NULL, E_WARNING, "Error assigning signal");
Expand All @@ -794,13 +809,6 @@ PHP_FUNCTION(pcntl_signal)
RETURN_TRUE;
}

if (!zend_is_callable_ex(handle, NULL, 0, NULL, NULL, NULL)) {
PCNTL_G(last_error) = EINVAL;

zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_value_name(handle));
RETURN_THROWS();
}

/* Register with the OS first so that on failure we don't record a handler that was never installed */
if (php_signal4(signo, pcntl_signal_handler, (int) restart_syscalls, 1) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
Expand Down
49 changes: 49 additions & 0 deletions ext/pcntl/tests/pcntl_signal_sigkill_sigstop.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
pcntl_signal() returns false for SIGKILL and SIGSTOP
--EXTENSIONS--
pcntl
--FILE--
<?php
foreach ([SIGKILL, SIGSTOP] as $signo) {
var_dump(pcntl_signal($signo, SIG_IGN));
var_dump(pcntl_signal($signo, SIG_DFL));
var_dump(pcntl_signal($signo, function () {}));
var_dump(pcntl_get_last_error() === PCNTL_EINVAL);
}

foreach ([SIGKILL, SIGSTOP] as $signo) {
foreach (['not_a_function', 42] as $handler) {
try {
var_dump(pcntl_signal($signo, $handler));
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), "\n";
}
}
}
echo "alive\n";
?>
--EXPECTF--
Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)

Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)

Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)
bool(true)

Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)

Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)

Warning: pcntl_signal(): Error assigning signal in %s on line %d
bool(false)
bool(true)
TypeError: pcntl_signal(): Argument #2 ($handler) must be of type callable|int, string given
ValueError: pcntl_signal(): Argument #2 ($handler) must be either SIG_DFL or SIG_IGN when an integer value is given
TypeError: pcntl_signal(): Argument #2 ($handler) must be of type callable|int, string given
ValueError: pcntl_signal(): Argument #2 ($handler) must be either SIG_DFL or SIG_IGN when an integer value is given
alive
Loading