Be sure to null terminate the string in MsiGetProductInfoA after the

W->A conversion using MsiGetProductInfoW if there is space.

Be sure to null terminate the string in MsiGetProductInfoA after the
685aa44b · Aric Stewart · Alexandre Julliard · e415baad · 685aa44b
Commit 685aa44b authored Sep 06, 2005 by Aric Stewart Committed by Alexandre Julliard Sep 06, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

msi.c dlls/msi/msi.c +5 -0

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -500,8 +500,13 @@ UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute,
                            &pcchwValueBuf );

    if( ERROR_SUCCESS == r )
+    {
+        INT old_len = *pcchValueBuf;
        *pcchValueBuf = WideCharToMultiByte(CP_ACP, 0, szwBuffer, pcchwValueBuf,
                        szBuffer, *pcchValueBuf, NULL, NULL);
+        if (old_len > *pcchValueBuf)
+            szBuffer[*pcchValueBuf]=0;
+    }

 end:
    HeapFree( GetProcessHeap(), 0, szwProduct );