shell32: Check error return in get_known_folder_path (Coverity).

a05ba2b9 · Marcus Meissner · Alexandre Julliard · 3dc66a9d · a05ba2b9
Commit a05ba2b9 authored Jul 14, 2011 by Marcus Meissner Committed by Alexandre Julliard Jul 14, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

No files found.
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3422,9 +3422,14 @@ static HRESULT get_known_folder_path(
    if(hr == S_OK)
    {
        /* get parent's known folder path (recursive) */
-        get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath);
+        hr = get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath);
+        if(!SUCCEEDED(hr)) return hr;

        hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath);
+        if(!SUCCEEDED(hr)) {
+            HeapFree(GetProcessHeap(), 0, parentRegistryPath);
+            return hr;
+        }

        lstrcatW(path, parentPath);
        lstrcatW(path, sBackslash);