Skip to content

ext/posix posix_ttyname/posix_isatty fd error handling update. #17209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ext/posix posix_ttyname/posix_isatty fd error handling update. #17209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions ext/posix/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ PHP_FUNCTION(posix_ttyname)
/* fd must fit in an int and be positive */
if (fd < 0 || fd > INT_MAX) {
php_error_docref(NULL, E_WARNING, "Argument #1 ($file_descriptor) must be between 0 and %d", INT_MAX);
POSIX_G(last_error) = EBADF;
RETURN_FALSE;
}
}
Expand Down Expand Up @@ -532,6 +533,7 @@ PHP_FUNCTION(posix_isatty)

/* A valid file descriptor must fit in an int and be positive */
if (fd < 0 || fd > INT_MAX) {
php_error_docref(NULL, E_WARNING, "Argument #1 ($file_descriptor) must be between 0 and %d", INT_MAX);
POSIX_G(last_error) = EBADF;
RETURN_FALSE;
}
Expand Down Expand Up @@ -1325,6 +1327,12 @@ PHP_FUNCTION(posix_fpathconf)
RETURN_THROWS();
}
}
/* fd must fit in an int and be positive */
if (fd < 0 || fd > INT_MAX) {
php_error_docref(NULL, E_WARNING, "Argument #1 ($file_descriptor) must be between 0 and %d", INT_MAX);
POSIX_G(last_error) = EBADF;
RETURN_FALSE;
}

ret = fpathconf(fd, name);

Expand Down
4 changes: 4 additions & 0 deletions ext/posix/tests/posix_fpathconf.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ if (!function_exists("posix_pathconf")) die("skip only platforms with posix_path
<?php
var_dump(posix_fpathconf(-1, POSIX_PC_PATH_MAX));
var_dump(posix_errno() != 0);
var_dump(posix_strerror(posix_errno()));
try {
posix_fpathconf("string arg", POSIX_PC_PATH_MAX);
} catch (\TypeError $e) {
Expand All @@ -20,7 +21,10 @@ var_dump(posix_fpathconf($fd, POSIX_PC_PATH_MAX));
fclose($fd);
?>
--EXPECTF--

Warning: posix_fpathconf(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
bool(true)
string(19) "Bad file descriptor"
posix_fpathconf(): Argument #1 ($file_descriptor) must be of type int|resource, string given
int(%d)
6 changes: 5 additions & 1 deletion ext/posix/tests/posix_isatty_value_errors.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ foreach ($values as $value) {
var_dump(posix_strerror(posix_get_last_error()));
}
?>
--EXPECT--
--EXPECTF--

Warning: posix_isatty(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
string(19) "Bad file descriptor"
bool(false)
string(19) "Bad file descriptor"

Warning: posix_isatty(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
string(19) "Bad file descriptor"
3 changes: 3 additions & 0 deletions ext/posix/tests/posix_ttyname_value_errors.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ $values = [

foreach ($values as $value) {
var_dump(posix_ttyname($value));
var_dump(posix_strerror(posix_get_last_error()));
}
?>
--EXPECTF--
Warning: posix_ttyname(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
string(19) "Bad file descriptor"

Warning: posix_ttyname(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
string(19) "Bad file descriptor"
Loading