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

msvcrt: Check pmode in _wsopen_dispatch. 

Signed-off-by: Lauri Kenttä <lauri.kentta@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Lauri Kenttä 2017-02-04 16:38:03 +02:00 committed by Alexandre Julliard
parent 85214c56e3
commit 2775931536
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcrt/file.c
View File

@ -2171,8 +2171,8 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s
if (oflags & MSVCRT__O_CREAT) if (oflags & MSVCRT__O_CREAT)
{ {
if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) if (secure && !MSVCRT_CHECK_PMT(!(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE))))
FIXME(": pmode 0x%04x ignored\n", pmode); return MSVCRT_EINVAL;
if (oflags & MSVCRT__O_EXCL) if (oflags & MSVCRT__O_EXCL)
creation = CREATE_NEW; creation = CREATE_NEW;

4
dlls/ucrtbase/tests/misc.c
View File

@ -396,11 +396,9 @@ static void test__sopen_dispatch(void)
SET_EXPECT(global_invalid_parameter_handler); SET_EXPECT(global_invalid_parameter_handler);
fd = 0; fd = 0;
ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1); ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1);
todo_wine {
ok(ret == EINVAL, "got %d\n", ret); ok(ret == EINVAL, "got %d\n", ret);
ok(fd == -1, "got fd %d\n", fd); ok(fd == -1, "got fd %d\n", fd);
CHECK_CALLED(global_invalid_parameter_handler); CHECK_CALLED(global_invalid_parameter_handler);
}
if (fd > 0) if (fd > 0)
{ {
_close(fd); _close(fd);
@ -438,11 +436,9 @@ static void test__sopen_s(void)
SET_EXPECT(global_invalid_parameter_handler); SET_EXPECT(global_invalid_parameter_handler);
fd = 0; fd = 0;
ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0xff); ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0xff);
todo_wine {
ok(ret == EINVAL, "got %d\n", ret); ok(ret == EINVAL, "got %d\n", ret);
ok(fd == -1, "got fd %d\n", fd); ok(fd == -1, "got fd %d\n", fd);
CHECK_CALLED(global_invalid_parameter_handler); CHECK_CALLED(global_invalid_parameter_handler);
}
p__set_invalid_parameter_handler(NULL); p__set_invalid_parameter_handler(NULL);
free(tempf); free(tempf);