From b34321a2214cf2b46eec9b269847d4188421e7b6 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 24 Aug 2016 15:39:52 +0000 Subject: [PATCH] win32/file.c: fix result length * win32/file.c (append_wstr): exclude the terminator from the result length when input len == -1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/file.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07dec93d04..9ea3b00d0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 25 00:39:50 2016 Nobuyoshi Nakada + + * 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 * 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);