shell32: Don't access uninitialized buffer (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Don't access uninitialized buffer (Coverity).
3c6cbc2f · Nikolay Sivov · Alexandre Julliard · 333c5bd9 · 3c6cbc2f
Commit 3c6cbc2f authored Dec 14, 2016 by Nikolay Sivov Committed by Alexandre Julliard Dec 14, 2016
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

shellpath.c dlls/shell32/shellpath.c +8 -3

No files found.
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -4735,6 +4735,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t
            hr = E_INVALIDARG;
            break;
        case CSIDL_Type_NonExistent:
+            *tempW = 0;
            hr = S_FALSE;
            break;
        case CSIDL_Type_WindowsPath:
@@ -4785,14 +4786,18 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t
            break;
    }

+    if (FAILED(hr))
+        goto failed;
+
    /* Expand environment strings if necessary */
    if (*tempW == '%')
+    {
        hr = _SHExpandEnvironmentStrings(tempW, pathW);
-    else
-        strcpyW(pathW, tempW);
-
        if (FAILED(hr))
            goto failed;
+    }
+    else
+        strcpyW(pathW, tempW);

    /* if we don't care about existing directories we are ready */
    if (flags & KF_FLAG_DONT_VERIFY) goto done;