diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/file.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Aug 25 00:39:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/file.c (append_wstr): exclude the terminator from the + result length when input len == -1. + Wed Aug 24 22:41:30 2016 Kouhei Sutou <kou@cozmixng.org> * gc.c (gc_reset_malloc_info): Remove too much ";". diff --git a/win32/file.c b/win32/file.c index 6e7e5110ef..8ed763d65e 100644 --- a/win32/file.c +++ b/win32/file.c @@ -280,11 +280,12 @@ user_length_in_path(const wchar_t *wuser, size_t len) } static VALUE -append_wstr(VALUE dst, const wchar_t *ws, size_t len, UINT cp, UINT path_cp, rb_encoding *path_encoding) +append_wstr(VALUE dst, const WCHAR *ws, ssize_t len, UINT cp, UINT path_cp, rb_encoding *path_encoding) { long olen, nlen = (long)len; if (cp == path_cp) { + if (len == -1) len = lstrlenW(ws); nlen = WideCharToMultiByte(cp, 0, ws, len, NULL, 0, NULL, NULL); olen = RSTRING_LEN(dst); rb_str_modify_expand(dst, nlen); |