From c3c7773b294df2a2af7cc68a653aced730d67610 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Aug 2016 15:39:52 +0000
Subject: 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
---
 win32/file.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'win32')

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);
-- 
cgit v1.2.3