Skip to content

8253572: [windows] CDS archive may fail to open with long file names #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tstuefe wants to merge 1 commit into from
Closed

8253572: [windows] CDS archive may fail to open with long file names #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/hotspot/os/windows/os_windows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4827,15 +4827,25 @@ static int stdinAvailable(int fd, long *pbytes) {
char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset,
char *addr, size_t bytes, bool read_only,
bool allow_exec) {

errno_t err;
wchar_t* wide_path = wide_abs_unc_path(file_name, err);

if (wide_path == NULL) {
return NULL;
}

HANDLE hFile;
char* base;

hFile = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL,
hFile = CreateFileW(wide_path, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) {
log_info(os)("CreateFile() failed: GetLastError->%ld.", GetLastError());
log_info(os)("CreateFileW() failed: GetLastError->%ld.", GetLastError());
os::free(wide_path);
return NULL;
}
os::free(wide_path);

if (allow_exec) {
// CreateFileMapping/MapViewOfFileEx can't map executable memory
Expand Down