shell32: Handle string-to-guid conversion errors (Coverity).

69733d65 · Nikolay Sivov · Alexandre Julliard · b49f9f60 · 69733d65
Commit 69733d65 authored Jul 06, 2015 by Nikolay Sivov Committed by Alexandre Julliard Jul 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

shellpath.c dlls/shell32/shellpath.c +5 -1

No files found.
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -5334,7 +5334,11 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition(
    hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szParentFolder,
                RRF_RT_REG_SZ, NULL, parentGuid, &dwSize));
    if(SUCCEEDED(hr))
-        IIDFromString(parentGuid, &pKFD->fidParent);
+    {
+        hr = IIDFromString(parentGuid, &pKFD->fidParent);
+        if(FAILED(hr))
+            return hr;
+    }

    get_known_folder_dword(knownfolder->registryPath, szAttributes, &pKFD->dwAttributes);