diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dir.c | 20 |
2 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Fri Mar 6 02:26:03 2015 NAKAMURA Usaku <usa@ruby-lang.org> + + * dir.c (replace_real_basename): shouldn't create Ruby object before + the object system is loaded. + [ruby-core:68430] [Bug #10941] + Wed Mar 5 16:58:43 2015 Kazuki Tanaka <gogotanaka@ruby-lang.org> * hash.c: [DOC] #delete method actually returns nil, if the key @@ -1488,12 +1488,22 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) free(wplain); if (h == INVALID_HANDLE_VALUE) return path; FindClose(h); - tmp = rb_w32_conv_from_wchar(fd.cFileName, enc); - wlen = RSTRING_LEN(tmp); - path = GLOB_REALLOC(path, base + wlen + 1); - memcpy(path + base, RSTRING_PTR(tmp), wlen); + if (tmp) { + tmp = rb_w32_conv_from_wchar(fd.cFileName, enc); + wlen = RSTRING_LEN(tmp); + path = GLOB_REALLOC(path, base + wlen + 1); + memcpy(path + base, RSTRING_PTR(tmp), wlen); + rb_str_resize(tmp, 0); + } + else { + char *utf8filename; + wlen = WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, NULL, 0, NULL, NULL); + utf8filename = GLOB_REALLOC(0, wlen); + WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, utf8filename, wlen, NULL, NULL); + memcpy(path + base, utf8filename, wlen); + GLOB_FREE(utf8filename); + } path[base + wlen] = 0; - rb_str_resize(tmp, 0); return path; } #elif USE_NAME_ON_FS == 1 |