archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Promote warnings to exceptions in sapi_windows_* functions

Browse source
This commit is contained in:
Máté Kocsis 2019-12-11 14:38:37 +01:00
parent 3b0a1905dd
commit 381c9c180b
No known key found for this signature in database
GPG key ID: FD055E41728BF310
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
win32/signal.c
View file

@ -91,21 +91,22 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler)
zval *handler = NULL;
zend_bool add = 1;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &handler, &add) == FAILURE) {
return;
}
#if ZTS
if (!tsrm_is_main_thread()) {
php_error_docref(NULL, E_WARNING, "CTRL events can only be received on the main thread");
zend_throw_error(NULL, "CTRL events can only be received on the main thread");
return;
}
#endif
if (!php_win32_console_is_cli_sapi()) {
php_error_docref(NULL, E_WARNING, "CTRL events trapping is only supported on console");
zend_throw_error(NULL, "CTRL events trapping is only supported on console");
return;
}
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &handler, &add) == FAILURE) {
return;
}
if (IS_NULL == Z_TYPE_P(handler)) {
zval_dtor(&ctrl_handler);
@ -118,9 +119,9 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler)
if (!zend_is_callable(handler, 0, NULL)) {
zend_string *func_name = zend_get_callable_name(handler);
php_error_docref(NULL, E_WARNING, "%s is not a callable function name error", ZSTR_VAL(func_name));
zend_type_error("%s is not a callable function name error", ZSTR_VAL(func_name));
zend_string_release_ex(func_name, 0);
RETURN_FALSE;
return;
}
if (!SetConsoleCtrlHandler(NULL, FALSE) || !SetConsoleCtrlHandler(php_win32_signal_system_ctrl_handler, add)) {
@ -141,12 +142,12 @@ PHP_FUNCTION(sapi_windows_generate_ctrl_event)
zend_long evt, pid = 0;
zend_bool ret = 0;
if (!php_win32_console_is_cli_sapi()) {
php_error_docref(NULL, E_WARNING, "CTRL events trapping is only supported on console");
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &evt, &pid) == FAILURE) {
return;
}
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &evt, &pid) == FAILURE) {
if (!php_win32_console_is_cli_sapi()) {
zend_throw_error(NULL, "CTRL events trapping is only supported on console");
return;
}