diff options
| author | John Högberg <[email protected]> | 2019-03-22 09:38:48 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-03-22 09:38:48 +0100 |
| commit | 4c744d0c81273c4c53a0dd267baf46a71814196e (patch) | |
| tree | f2bc8d300ac428edb69b7ef3b63ef52cdd392f56 | |
| parent | 86184644edc60f03be13b5dcb143a7ac425eccc9 (diff) | |
| parent | 526bc873d91b134ffab0c484553d42a510bccd96 (diff) | |
| download | otp-4c744d0c81273c4c53a0dd267baf46a71814196e.tar.gz otp-4c744d0c81273c4c53a0dd267baf46a71814196e.tar.bz2 otp-4c744d0c81273c4c53a0dd267baf46a71814196e.zip | |
Merge branch 'john/erts/unc-path-size-fix/OTP-15693'
* john/erts/unc-path-size-fix/OTP-15693:
erts: Fix incorrect UNC path length calculation
| -rw-r--r-- | erts/emulator/nifs/win32/win_prim_file.c | 9 | ||||
| -rw-r--r-- | lib/kernel/test/file_SUITE.erl | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/nifs/win32/win_prim_file.c b/erts/emulator/nifs/win32/win_prim_file.c index d0aa70542f..e7d3924240 100644 --- a/erts/emulator/nifs/win32/win_prim_file.c +++ b/erts/emulator/nifs/win32/win_prim_file.c @@ -142,12 +142,15 @@ static posix_errno_t get_full_path(ErlNifEnv *env, WCHAR *input, efile_path_t *r maybe_unc_path = !sys_memcmp(result->data, L"\\\\", sizeof(WCHAR) * 2); if(maybe_unc_path && !is_long_path) { - /* \\localhost\c$\gurka -> \\?\UNC\localhost\c$\gurka */ + /* \\localhost\c$\gurka -> \\?\UNC\localhost\c$\gurka + * + * Note that the length is reduced by 2 as the "\\" is replaced by + * the UNC prefix */ sys_memmove(result->data + LP_UNC_PREFIX_SIZE, &((WCHAR*)result->data)[2], - (actual_length - 1) * sizeof(WCHAR)); + (actual_length + 1 - 2) * sizeof(WCHAR)); sys_memcpy(result->data, LP_UNC_PREFIX, LP_UNC_PREFIX_SIZE); - actual_length += LP_UNC_PREFIX_LENGTH; + actual_length += LP_UNC_PREFIX_LENGTH - 2; } else if(!is_long_path) { /* C:\gurka -> \\?\C:\gurka */ sys_memmove(result->data + LP_PREFIX_SIZE, result->data, diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl index a51025cba6..711ffccb67 100644 --- a/lib/kernel/test/file_SUITE.erl +++ b/lib/kernel/test/file_SUITE.erl @@ -2191,6 +2191,9 @@ unc_paths(Config) when is_list(Config) -> {ok, _} = file:read_file_info("C:\\Windows\\explorer.exe"), {ok, _} = file:read_file_info("\\\\localhost\\c$\\Windows\\explorer.exe"), + {ok, Files} = file:list_dir("C:\\Windows\\"), + {ok, Files} = file:list_dir("\\\\localhost\\c$\\Windows\\"), + {ok, Cwd} = file:get_cwd(), try |