--- old/src/hotspot/os/windows/os_windows.cpp 2020-03-04 17:13:51.592342600 +0900 +++ new/src/hotspot/os/windows/os_windows.cpp 2020-03-04 17:13:51.264248000 +0900 @@ -4161,6 +4161,58 @@ } } +static errno_t convert_to_unicode(char const* char_path, LPWSTR& unicode_path) { + // Get required buffer size to convert to Unicode + int unicode_path_len = MultiByteToWideChar(CP_THREAD_ACP, + MB_ERR_INVALID_CHARS, + char_path, -1, + NULL, 0); + if (unicode_path_len == 0) { + return EINVAL; + } + + size_t unicode_path_size = sizeof(WCHAR) * unicode_path_len; + unicode_path = reinterpret_cast(os::malloc(unicode_path_size, mtInternal)); + if (unicode_path == NULL) { + vm_exit_out_of_memory(unicode_path_size, OOM_MALLOC_ERROR, "convert_to_unicode"); + } + + // This call would be success because it is checked in above + MultiByteToWideChar(CP_THREAD_ACP, + MB_ERR_INVALID_CHARS, + char_path, -1, + unicode_path, unicode_path_len); + + return ERROR_SUCCESS; +} + +static errno_t get_full_path(LPCWSTR unicode_path, LPWSTR& full_path) { + // Get required buffer size to convert to full path + DWORD full_path_len = GetFullPathNameW(unicode_path, 0, NULL, NULL); + if (full_path_len == 0) { + return EINVAL; + } + + size_t full_path_size = sizeof(WCHAR) * full_path_len; + full_path = reinterpret_cast(os::malloc(full_path_size, mtInternal)); + if (full_path == NULL) { + vm_exit_out_of_memory(full_path_size, OOM_MALLOC_ERROR, "get_full_path"); + } + + // This call would be success because it is checked in above + GetFullPathNameW(unicode_path, full_path_len, full_path, NULL); + + return ERROR_SUCCESS; +} + +class MemoryCleaner{ + private: + void* mem; + public: + MemoryCleaner(void* memory) : mem(memory) {}; + ~MemoryCleaner() { os::free(mem); } +}; + // Returns the given path as an absolute wide path in unc format. The returned path is NULL // on error (with err being set accordingly) and should be freed via os::free() otherwise. // additional_space is the number of additionally allocated wchars after the terminating L'\0'. @@ -4172,87 +4224,75 @@ return NULL; } - size_t path_len = strlen(path); // Need to allocate at least room for 3 characters, since os::native_path transforms C: to C:. - char* buf = (char*) os::malloc(1 + MAX2((size_t) 3, path_len), mtInternal); - wchar_t* result = NULL; - + size_t buf_size = 1 + MAX2((size_t)3, strlen(path)); + char* buf = reinterpret_cast(os::malloc(buf_size, mtInternal)); if (buf == NULL) { - err = ENOMEM; - } else { - memcpy(buf, path, path_len + 1); - os::native_path(buf); + vm_exit_out_of_memory(buf_size, OOM_MALLOC_ERROR, "wide_abs_unc_path"); + } + MemoryCleaner buf_cleaner(buf); + memcpy(buf, path, buf_size); + os::native_path(buf); + + LPWSTR unicode_path; + err = convert_to_unicode(buf, unicode_path); + if (err != ERROR_SUCCESS) { + os::free(buf); + return NULL; + } + MemoryCleaner unicode_path_cleaner(unicode_path); - wchar_t* prefix; - int prefix_off = 0; - bool is_abs = true; - bool needs_fullpath = true; - - if (::isalpha(buf[0]) && !::IsDBCSLeadByte(buf[0]) && buf[1] == ':' && buf[2] == '\\') { - prefix = L"\\\\?\\"; - } else if (buf[0] == '\\' && buf[1] == '\\') { - if (buf[2] == '?' && buf[3] == '\\') { - prefix = L""; - needs_fullpath = false; - } else { - prefix = L"\\\\?\\UNC"; - prefix_off = 1; // Overwrite the first char with the prefix, so \\share\path becomes \\?\UNC\share\path - } + LPWSTR prefix; + int prefix_off = 0; + bool needs_fullpath = true; + + if (::isalpha(buf[0]) && !::IsDBCSLeadByte(buf[0]) && buf[1] == ':' && buf[2] == '\\') { + prefix = L"\\\\?\\"; + } else if (buf[0] == '\\' && buf[1] == '\\') { + if (buf[2] == '?' && buf[3] == '\\') { + prefix = L""; + needs_fullpath = false; } else { - is_abs = false; - prefix = L"\\\\?\\"; + prefix = L"\\\\?\\UNC"; + prefix_off = 1; // Overwrite the first char with the prefix, so \\share\path becomes \\?\UNC\share\path } + } else { + prefix = L"\\\\?\\"; + } - size_t buf_len = strlen(buf); - size_t prefix_len = wcslen(prefix); - size_t full_path_size = is_abs ? 1 + buf_len : JVM_MAXPATHLEN; - size_t result_size = prefix_len + full_path_size - prefix_off; - result = (wchar_t*) os::malloc(sizeof(wchar_t) * (additional_space + result_size), mtInternal); - - if (result == NULL) { - err = ENOMEM; - } else { - size_t converted_chars; - wchar_t* path_start = result + prefix_len - prefix_off; - err = ::mbstowcs_s(&converted_chars, path_start, buf_len + 1, buf, buf_len); - - if ((err == ERROR_SUCCESS) && needs_fullpath) { - wchar_t* tmp = (wchar_t*) os::malloc(sizeof(wchar_t) * full_path_size, mtInternal); - - if (tmp == NULL) { - err = ENOMEM; - } else { - if (!_wfullpath(tmp, path_start, full_path_size)) { - err = ENOENT; - } else { - ::memcpy(path_start, tmp, (1 + wcslen(tmp)) * sizeof(wchar_t)); - } - - os::free(tmp); - } - } - - memcpy(result, prefix, sizeof(wchar_t) * prefix_len); - - // Remove trailing pathsep (not for \\?\:\, since it would make it relative) - size_t result_len = wcslen(result); - - if (result[result_len - 1] == L'\\') { - if (!(::iswalpha(result[4]) && result[5] == L':' && result_len == 7)) { - result[result_len - 1] = L'\0'; - } - } + LPWSTR converted_path; + if (needs_fullpath) { + err = get_full_path(unicode_path, converted_path); + if (err != ERROR_SUCCESS) { + return NULL; + } + } else { + size_t converted_path_size = sizeof(WCHAR) * (wcslen(unicode_path) + 1); + converted_path = reinterpret_cast(os::malloc(converted_path_size, mtInternal)); + if (converted_path == NULL) { + vm_exit_out_of_memory(buf_size, OOM_MALLOC_ERROR, "wide_abs_unc_path"); } + memcpy(converted_path, unicode_path, converted_path_size); } + MemoryCleaner converted_path_cleaner(converted_path); - os::free(buf); + size_t prefix_len = wcslen(prefix); + size_t result_len = prefix_len - prefix_off + wcslen(converted_path) + additional_space + 1; + LPWSTR result = reinterpret_cast(os::malloc(sizeof(WCHAR) * result_len, mtInternal)); + if (result == NULL) { + vm_exit_out_of_memory(buf_size, OOM_MALLOC_ERROR, "wide_abs_unc_path"); + } + _snwprintf(result, result_len, L"%s%s", prefix, &converted_path[prefix_off]); - if (err != ERROR_SUCCESS) { - os::free(result); - result = NULL; + // Remove trailing pathsep (not for \\?\:\, since it would make it relative) + result_len = wcslen(result); + if (result[result_len - 1] == L'\\') { + if (!(::iswalpha(result[4]) && result[5] == L':' && result_len == 7)) { + result[result_len - 1] = L'\0'; + } } - return result; + return (wchar_t*)result; // LPWSTR and wchat_t* are the same type on Windows. } int os::stat(const char *path, struct stat *sbuf) {