diff options
Diffstat (limited to 'ext/pcntl/pcntl.c')
| -rw-r--r-- | ext/pcntl/pcntl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index cd85080c9b..1bb67af6c5 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1058,6 +1058,7 @@ PHP_FUNCTION(pcntl_signal) zend_long signo; zend_bool restart_syscalls = 1; zend_bool restart_syscalls_is_null = 1; + char *error = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "lz|b!", &signo, &handle, &restart_syscalls, &restart_syscalls_is_null) == FAILURE) { return; @@ -1103,13 +1104,15 @@ PHP_FUNCTION(pcntl_signal) RETURN_TRUE; } - if (!zend_is_callable(handle, 0, NULL)) { + if (!zend_is_callable_ex(handle, NULL, 0, NULL, NULL, &error)) { zend_string *func_name = zend_get_callable_name(handle); PCNTL_G(last_error) = EINVAL; - php_error_docref(NULL, E_WARNING, "%s is not a callable function name error", ZSTR_VAL(func_name)); + php_error_docref(NULL, E_WARNING, "Specified handler \"%s\" is not callable (%s)", ZSTR_VAL(func_name), error); zend_string_release_ex(func_name, 0); + efree(error); RETURN_FALSE; } + ZEND_ASSERT(!error); /* Add the function name to our signal table */ handle = zend_hash_index_update(&PCNTL_G(php_signal_table), signo, handle); |