Module: wine Branch: master Commit: e978b3aa84b1d8d411e27d8d77f2e8e6b499e45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e978b3aa84b1d8d411e27d8d7...
Author: Gijs Vermeulen gijsvrm@gmail.com Date: Sat Jan 26 22:17:55 2019 +0100
msvcp: Return ERROR_INVALID_PARAMETER on NULL input in _Copy_file.
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcp120/tests/msvcp120.c | 28 +++++++++++++--------------- dlls/msvcp90/ios.c | 3 +++ 2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 534c015..70fc0c1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1426,19 +1426,18 @@ static void test_tr2_sys__Copy_file(void) MSVCP_bool fail_if_exists; int last_error; int last_error2; - MSVCP_bool is_todo; } tests[] = { - { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS, FALSE }, - { "f1", "tr2_test_dir\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "not_exist_dir\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS, FALSE } + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS }, + { "f1", "tr2_test_dir\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "not_exist_dir\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS } };
ret = p_tr2_sys__Make_dir("tr2_test_dir"); @@ -1453,9 +1452,8 @@ static void test_tr2_sys__Copy_file(void) for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); - todo_wine_if(tests[i].is_todo) - ok(ret == tests[i].last_error || ret == tests[i].last_error2, - "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 743e4ca..7f792d6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14767,6 +14767,9 @@ int __cdecl tr2_sys__Copy_file(char const* source, char const* dest, MSVCP_bool { TRACE("(%s %s %x)\n", debugstr_a(source), debugstr_a(dest), fail_if_exists);
+ if(!source || !dest) + return ERROR_INVALID_PARAMETER; + if(CopyFileA(source, dest, fail_if_exists)) return ERROR_SUCCESS; return GetLastError();