Zebediah Figura : version: Use the string value length when converting strings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bec279d8c1d571e0fe9f03e3215f489b60a71af9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bec279d8c1d571e0fe9f03e321...

Author: Zebediah Figura 
Date:   Sun Oct 29 21:15:01 2017 +0100

version: Use the string value length when converting strings.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/version/version.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/version/version.c b/dlls/version/version.c
index ed060c8..13436ca 100644
--- a/dlls/version/version.c
+++ b/dlls/version/version.c
@@ -1010,6 +1010,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
         BOOL ret, isText;
         INT len;
         LPWSTR lpSubBlockW;
+        UINT value_len;

len  = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0);
         lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
@@ -1019,7 +1020,8 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,

MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len);

-        ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen, &isText);
+        ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, &value_len, &isText);
+        if (puLen) *puLen = value_len;

HeapFree(GetProcessHeap(), 0, lpSubBlockW);

@@ -1030,8 +1032,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
              */
             LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4;
             DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock;
-
-            len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1,
+            len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, value_len,
                                       lpBufferA + pos, info->wLength - pos, NULL, NULL);
             *lplpBuffer = lpBufferA + pos;
             if (puLen) *puLen = len;