kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if…

kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if GetPrivateProfileStringW returns 0. The buffer that was passed into the function will remain uninitialised. Fix reading from this by only reading retW characters from bufferW and manually nul-terminating the string.

kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if…
47acaeae · Rob Shearman · Alexandre Julliard · 2226b678 · 47acaeae
Commit 47acaeae authored Nov 29, 2009 by Rob Shearman Committed by Alexandre Julliard Nov 29, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

profile.c dlls/kernel32/profile.c +5 -6

No files found.
--- a/dlls/kernel32/profile.c
+++ b/dlls/kernel32/profile.c
@@ -1173,14 +1173,13 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry,
                                     filenameW.Buffer);
    if (len)
    {
-        ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL);
-        if (!ret)
+        if (retW)
        {
-            ret = len - 1;
-            buffer[ret] = 0;
+            ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL);
+            if (!ret)
+                ret = len - 1;
        }
-        else
-            ret--; /* strip terminating 0 */
+        buffer[ret] = 0;
    }

    RtlFreeUnicodeString(&sectionW);