ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix read() behaviour on "no console" file descriptors. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2017-11-15 09:47:33 +01:00 committed by Alexandre Julliard
parent 677301a29c
commit 9b2397d5c8
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/msvcrt/file.c
View File

@ -2892,6 +2892,7 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count)
else else
{ {
TRACE(":failed-last error (%d)\n",GetLastError()); TRACE(":failed-last error (%d)\n",GetLastError());
msvcrt_set_errno(GetLastError());
return -1; return -1;
} }
} }
@ -2906,8 +2907,16 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count)
*/ */
int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) int CDECL MSVCRT__read(int fd, void *buf, unsigned int count)
{ {
ioinfo *info = get_ioinfo(fd); ioinfo *info;
int num_read = read_i(fd, info, buf, count); int num_read;
if(fd == MSVCRT_NO_CONSOLE_FD) {
*MSVCRT__errno() = MSVCRT_EBADF;
return -1;
}
info = get_ioinfo(fd);
num_read = read_i(fd, info, buf, count);
release_ioinfo(info); release_ioinfo(info);
return num_read; return num_read;
} }
@ -4291,9 +4300,12 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s
{ {
int i; int i;
if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) {
file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); i = MSVCRT__read(file->_file, file->_base, file->_bufsiz);
file->_ptr = file->_base; file->_ptr = file->_base;
i = (file->_cnt<rcnt) ? file->_cnt : rcnt; if (i != -1) {
file->_cnt = i;
if (i > rcnt) i = rcnt;
}
/* If the buffer fill reaches eof but fread wouldn't, clear eof. */ /* If the buffer fill reaches eof but fread wouldn't, clear eof. */
if (i > 0 && i < file->_cnt) { if (i > 0 && i < file->_cnt) {
get_ioinfo_nolock(file->_file)->wxflag &= ~WX_ATEOF; get_ioinfo_nolock(file->_file)->wxflag &= ~WX_ATEOF;

16
dlls/msvcrt/tests/file.c
View File

@ -1528,6 +1528,7 @@ static void test_invalid_stdin_child( void )
HANDLE handle; HANDLE handle;
ioinfo *info; ioinfo *info;
int ret; int ret;
char c;
errno = 0xdeadbeef; errno = 0xdeadbeef;
handle = (HANDLE)_get_osfhandle(STDIN_FILENO); handle = (HANDLE)_get_osfhandle(STDIN_FILENO);
@ -1540,6 +1541,21 @@ static void test_invalid_stdin_child( void )
ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file);
errno = 0xdeadbeef;
ret = fread(&c, 1, 1, stdin);
ok(!ret, "fread(stdin) returned %d\n", ret);
ok(errno == EBADF, "errno = %d\n", errno);
errno = 0xdeadbeef;
ret = read(-2, &c, 1);
ok(ret == -1, "read(-2) returned %d\n", ret);
ok(errno == EBADF, "errno = %d\n", errno);
errno = 0xdeadbeef;
ret = read(STDIN_FILENO, &c, 1);
ok(ret == -1, "read(STDIN_FILENO) returned %d\n", ret);
ok(errno == EBADF, "errno = %d\n", errno);
errno = 0xdeadbeef; errno = 0xdeadbeef;
ret = fclose(stdin); ret = fclose(stdin);
ok(ret == -1, "fclose(stdin) returned %d\n", ret); ok(ret == -1, "fclose(stdin) returned %d\n", ret);