1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix opening multibyte character filepath on Windows

Browse Source
This commit is contained in:
Kevin Newton 2024-09-11 15:09:30 -04:00
parent d4af38ec9d
commit ca61729fa7
Notes: git 2024-09-12 17:43:25 +00:00 
Merged: https://github.com/ruby/ruby/pull/11497
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
prism_compile.c
View File

@ -10558,9 +10558,18 @@ read_entire_file(pm_string_t *string, const char *filepath)
{ {
#ifdef _WIN32 #ifdef _WIN32
// Open the file for reading. // Open the file for reading.
HANDLE file = CreateFile(filepath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); int length = MultiByteToWideChar(CP_UTF8, 0, filepath, -1, NULL, 0);
if (length == 0) return false;
WCHAR *wfilepath = xmalloc(sizeof(WCHAR) * ((size_t) length));
if ((wfilepath == NULL) || (MultiByteToWideChar(CP_UTF8, 0, filepath, -1, wfilepath, length) == 0)) {
xfree(wfilepath);
return false;
}
HANDLE file = CreateFileW(wfilepath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL);
if (file == INVALID_HANDLE_VALUE) { if (file == INVALID_HANDLE_VALUE) {
xfree(wfilepath);
return false; return false;
} }
@ -10568,6 +10577,7 @@ read_entire_file(pm_string_t *string, const char *filepath)
DWORD file_size = GetFileSize(file, NULL); DWORD file_size = GetFileSize(file, NULL);
if (file_size == INVALID_FILE_SIZE) { if (file_size == INVALID_FILE_SIZE) {
CloseHandle(file); CloseHandle(file);
xfree(wfilepath);
return false; return false;
} }
@ -10575,6 +10585,7 @@ read_entire_file(pm_string_t *string, const char *filepath)
// the source to a constant empty string and return. // the source to a constant empty string and return.
if (file_size == 0) { if (file_size == 0) {
CloseHandle(file); CloseHandle(file);
xfree(wfilepath);
const uint8_t source[] = ""; const uint8_t source[] = "";
*string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 }; *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
return true; return true;
@ -10584,6 +10595,7 @@ read_entire_file(pm_string_t *string, const char *filepath)
HANDLE mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); HANDLE mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
if (mapping == NULL) { if (mapping == NULL) {
CloseHandle(file); CloseHandle(file);
xfree(wfilepath);
return false; return false;
} }
@ -10591,6 +10603,7 @@ read_entire_file(pm_string_t *string, const char *filepath)
uint8_t *source = (uint8_t *) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); uint8_t *source = (uint8_t *) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
CloseHandle(mapping); CloseHandle(mapping);
CloseHandle(file); CloseHandle(file);
xfree(wfilepath);
if (source == NULL) { if (source == NULL) {
return false; return false;